| Message ID | 20231012114642.19040-35-benjamin.gaignard@collabora.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add DELETE_BUF ioctl | expand |
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@collabora.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;
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;
vb2 queue_setup checks for a minimum number of buffers so set min_buffers_needed to aCX231XX_MIN_BUFnd remove the useless check in cx231xx queue_setup(). Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> --- drivers/media/usb/cx231xx/cx231xx-417.c | 4 +--- drivers/media/usb/cx231xx/cx231xx-video.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)