From: Ming Qian Date: Tue, 22 Mar 2022 08:28:59 +0000 (+0100) Subject: media: amphion: ensure the buffer count is not less than min_buffer X-Git-Tag: v5.19-rc1~179^2~123 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7b602069cdddb59669cef7935c5ab06591945bfe;p=tomoyo%2Ftomoyo-test1.git media: amphion: ensure the buffer count is not less than min_buffer the output buffer count should >= min_buffer_out the capture buffer count should >= min_buffer_cap Signed-off-by: Ming Qian Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/platform/amphion/vpu_v4l2.c index 801bd08749d9..34ab941460df 100644 --- a/drivers/media/platform/amphion/vpu_v4l2.c +++ b/drivers/media/platform/amphion/vpu_v4l2.c @@ -398,6 +398,10 @@ static int vpu_vb2_queue_setup(struct vb2_queue *vq, return 0; } + if (V4L2_TYPE_IS_OUTPUT(vq->type)) + *buf_count = max_t(unsigned int, *buf_count, inst->min_buffer_out); + else + *buf_count = max_t(unsigned int, *buf_count, inst->min_buffer_cap); *plane_count = cur_fmt->num_planes; for (i = 0; i < cur_fmt->num_planes; i++) psize[i] = cur_fmt->sizeimage[i];