[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <dcf6f56a-2b6d-4178-ad8e-c0f40804aeba@xs4all.nl>
Date: Mon, 16 Oct 2023 10:20:19 +0200
From: Hans Verkuil <hverkuil-cisco@...all.nl>
To: Benjamin Gaignard <benjamin.gaignard@...labora.com>,
mchehab@...nel.org, tfiga@...omium.org, m.szyprowski@...sung.com,
ming.qian@....com, ezequiel@...guardiasur.com.ar,
p.zabel@...gutronix.de, gregkh@...uxfoundation.org,
nicolas.dufresne@...labora.com
Cc: linux-media@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org, linux-arm-msm@...r.kernel.org,
linux-rockchip@...ts.infradead.org, linux-staging@...ts.linux.dev,
kernel@...labora.com
Subject: Re: [PATCH v11 34/56] media: usb: cx231xx: Set min_buffers_needed to
CX231XX_MIN_BUF
On 12/10/2023 13:46, Benjamin Gaignard wrote:
> vb2 queue_setup checks for a minimum number of buffers so set
> min_buffers_needed to aCX231XX_MIN_BUFnd remove the useless check in
Garbled line.
Regards,
Hans
> cx231xx queue_setup().
>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@...labora.com>
> ---
> drivers/media/usb/cx231xx/cx231xx-417.c | 4 +---
> drivers/media/usb/cx231xx/cx231xx-video.c | 4 +---
> 2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c
> index c5e21785fafe..fecdb12f5ef7 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-417.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-417.c
> @@ -1223,9 +1223,6 @@ static int queue_setup(struct vb2_queue *vq,
> dev->ts1.ts_packet_size = mpeglinesize;
> dev->ts1.ts_packet_count = mpeglines;
>
> - if (vq->num_buffers + *nbuffers < CX231XX_MIN_BUF)
> - *nbuffers = CX231XX_MIN_BUF - vq->num_buffers;
> -
> if (*nplanes)
> return sizes[0] < size ? -EINVAL : 0;
> *nplanes = 1;
> @@ -1777,6 +1774,7 @@ int cx231xx_417_register(struct cx231xx *dev)
> q = &dev->mpegq;
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> q->io_modes = VB2_USERPTR | VB2_MMAP | VB2_DMABUF | VB2_READ;
> + q->min_buffers_needed = CX231XX_MIN_BUF;
> q->drv_priv = dev;
> q->buf_struct_size = sizeof(struct cx231xx_buffer);
> q->ops = &cx231xx_video_qops;
> diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
> index e23b8ccd79d4..26b593844157 100644
> --- a/drivers/media/usb/cx231xx/cx231xx-video.c
> +++ b/drivers/media/usb/cx231xx/cx231xx-video.c
> @@ -717,9 +717,6 @@ static int queue_setup(struct vb2_queue *vq,
>
> dev->size = (dev->width * dev->height * dev->format->depth + 7) >> 3;
>
> - if (vq->num_buffers + *nbuffers < CX231XX_MIN_BUF)
> - *nbuffers = CX231XX_MIN_BUF - vq->num_buffers;
> -
> if (*nplanes)
> return sizes[0] < dev->size ? -EINVAL : 0;
> *nplanes = 1;
> @@ -1805,6 +1802,7 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
> q = &dev->vidq;
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> q->io_modes = VB2_USERPTR | VB2_MMAP | VB2_DMABUF | VB2_READ;
> + q->min_buffers_needed = CX231XX_MIN_BUF;
> q->drv_priv = dev;
> q->buf_struct_size = sizeof(struct cx231xx_buffer);
> q->ops = &cx231xx_video_qops;
Powered by blists - more mailing lists