| Message ID | 20230914133323.198857-25-benjamin.gaignard@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add DELETE_BUF ioctl | expand |
On 14/09/2023 15:32, Benjamin Gaignard wrote: > Use vb2_get_num_buffers() to avoid using queue num_buffer field directly. > > Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> > --- > drivers/media/pci/dt3155/dt3155.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/pci/dt3155/dt3155.c b/drivers/media/pci/dt3155/dt3155.c > index 548156b199cc..d3abb0e093c1 100644 > --- a/drivers/media/pci/dt3155/dt3155.c > +++ b/drivers/media/pci/dt3155/dt3155.c > @@ -126,10 +126,11 @@ dt3155_queue_setup(struct vb2_queue *vq, > > { > struct dt3155_priv *pd = vb2_get_drv_priv(vq); > + unsigned int q_num_bufs = vb2_get_num_buffers(vq); > unsigned size = pd->width * pd->height; > > - if (vq->num_buffers + *nbuffers < 2) > - *nbuffers = 2 - vq->num_buffers; > + if (q_num_bufs + *nbuffers < 2) > + *nbuffers = 2 - q_num_bufs; Just drop this, min_buffers_needed is already set to 0. Regards, Hans > if (*num_planes) > return sizes[0] < size ? -EINVAL : 0; > *num_planes = 1;
diff --git a/drivers/media/pci/dt3155/dt3155.c b/drivers/media/pci/dt3155/dt3155.c index 548156b199cc..d3abb0e093c1 100644 --- a/drivers/media/pci/dt3155/dt3155.c +++ b/drivers/media/pci/dt3155/dt3155.c @@ -126,10 +126,11 @@ dt3155_queue_setup(struct vb2_queue *vq, { struct dt3155_priv *pd = vb2_get_drv_priv(vq); + unsigned int q_num_bufs = vb2_get_num_buffers(vq); unsigned size = pd->width * pd->height; - if (vq->num_buffers + *nbuffers < 2) - *nbuffers = 2 - vq->num_buffers; + if (q_num_bufs + *nbuffers < 2) + *nbuffers = 2 - q_num_bufs; if (*num_planes) return sizes[0] < size ? -EINVAL : 0; *num_planes = 1;
Use vb2_get_num_buffers() to avoid using queue num_buffer field directly. Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com> --- drivers/media/pci/dt3155/dt3155.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)