media: test-drivers: Stop direct calls to queue num_buffers field

Use vb2_get_num_buffers() to avoid using queue num_buffers field directly.
This allows us to change how the number of buffers is computed in the
future.
If 'min_buffers_needed' is set remove useless checks in queue setup
functions.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
CC: Daniel Almeida <daniel.almeida@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/test-drivers/visl/visl-dec.c b/drivers/media/test-drivers/visl/visl-dec.c
index ba20ea998d19fb61f48641733bb779529255e76f..4672dc5e52bb85d2223b1feb1d4c152b0a5daea1 100644 (file)
--- a/drivers/media/test-drivers/visl/visl-dec.c
+++ b/drivers/media/test-drivers/visl/visl-dec.c
@@ -287,7 +287,7 @@ static void visl_tpg_fill(struct visl_ctx *ctx, struct visl_run *run)
        frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf);
 
        len = 0;
-       for (i = 0; i < out_q->num_buffers; i++) {
+       for (i = 0; i < vb2_get_num_buffers(out_q); i++) {
                char entry[] = "index: %u, state: %s, request_fd: %d, ";
                u32 old_len = len;
                struct vb2_buffer *vb2;
@@ -347,7 +347,7 @@ static void visl_tpg_fill(struct visl_ctx *ctx, struct visl_run *run)
        frame_dprintk(ctx->dev, run->dst->sequence, "%s\n", buf);
 
        len = 0;
-       for (i = 0; i < cap_q->num_buffers; i++) {
+       for (i = 0; i < vb2_get_num_buffers(cap_q); i++) {
                u32 old_len = len;
                struct vb2_buffer *vb2;
                char *q_status;

diff --git a/drivers/media/test-drivers/vivid/vivid-meta-cap.c b/drivers/media/test-drivers/vivid/vivid-meta-cap.c
index 780f96860a6d79ebea7aef985ef0dbdff4423ac3..0a718d037e5944439f3c882d8a2661ec500318d7 100644 (file)
--- a/drivers/media/test-drivers/vivid/vivid-meta-cap.c
+++ b/drivers/media/test-drivers/vivid/vivid-meta-cap.c
@@ -30,9 +30,6 @@ static int meta_cap_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
                sizes[0] = size;
        }
 
-       if (vq->num_buffers + *nbuffers < 2)
-               *nbuffers = 2 - vq->num_buffers;
-
        *nplanes = 1;
        return 0;
 }

diff --git a/drivers/media/test-drivers/vivid/vivid-meta-out.c b/drivers/media/test-drivers/vivid/vivid-meta-out.c
index 95835b52b58fc7f652434764b6f7d4ca20d447d0..4a569a6e58be5f62c2922f0ec9fe9e85200f4399 100644 (file)
--- a/drivers/media/test-drivers/vivid/vivid-meta-out.c
+++ b/drivers/media/test-drivers/vivid/vivid-meta-out.c
@@ -18,6 +18,7 @@ static int meta_out_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
                                struct device *alloc_devs[])
 {
        struct vivid_dev *dev = vb2_get_drv_priv(vq);
+       unsigned int q_num_bufs = vb2_get_num_buffers(vq);
        unsigned int size =  sizeof(struct vivid_meta_out_buf);
 
        if (!vivid_is_webcam(dev))
@@ -30,8 +31,8 @@ static int meta_out_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
                sizes[0] = size;
        }
 
-       if (vq->num_buffers + *nbuffers < 2)
-               *nbuffers = 2 - vq->num_buffers;
+       if (q_num_bufs + *nbuffers < 2)
+               *nbuffers = 2 - q_num_bufs;
 
        *nplanes = 1;
        return 0;

diff --git a/drivers/media/test-drivers/vivid/vivid-touch-cap.c b/drivers/media/test-drivers/vivid/vivid-touch-cap.c
index c7f6e23df51e977bb14872f053d23c5d854e65cd..4b3c6ea0afde022e4f5f6cccf1116c7dcf225f7e 100644 (file)
--- a/drivers/media/test-drivers/vivid/vivid-touch-cap.c
+++ b/drivers/media/test-drivers/vivid/vivid-touch-cap.c
@@ -13,6 +13,7 @@ static int touch_cap_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
                                 struct device *alloc_devs[])
 {
        struct vivid_dev *dev = vb2_get_drv_priv(vq);
+       unsigned int q_num_bufs = vb2_get_num_buffers(vq);
        struct v4l2_pix_format *f = &dev->tch_format;
        unsigned int size = f->sizeimage;
 
@@ -23,8 +24,8 @@ static int touch_cap_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers,
                sizes[0] = size;
        }
 
-       if (vq->num_buffers + *nbuffers < 2)
-               *nbuffers = 2 - vq->num_buffers;
+       if (q_num_bufs + *nbuffers < 2)
+               *nbuffers = 2 - q_num_bufs;
 
        *nplanes = 1;
        return 0;

diff --git a/drivers/media/test-drivers/vivid/vivid-vbi-cap.c b/drivers/media/test-drivers/vivid/vivid-vbi-cap.c
index b65b02eeeb972124b5b921076c4b42575f7263d9..3840b3a664ac114c0e1741add402077cfbbd464b 100644 (file)
--- a/drivers/media/test-drivers/vivid/vivid-vbi-cap.c
+++ b/drivers/media/test-drivers/vivid/vivid-vbi-cap.c
@@ -134,9 +134,6 @@ static int vbi_cap_queue_setup(struct vb2_queue *vq,
 
        sizes[0] = size;
 
-       if (vq->num_buffers + *nbuffers < 2)
-               *nbuffers = 2 - vq->num_buffers;
-
        *nplanes = 1;
        return 0;
 }

diff --git a/drivers/media/test-drivers/vivid/vivid-vbi-out.c b/drivers/media/test-drivers/vivid/vivid-vbi-out.c
index cd56476902a2b16cbcbc77ec5b0f8fa6ebeac0fb..434a10676417a1f3439188edc6bc2c58c2ec1790 100644 (file)
--- a/drivers/media/test-drivers/vivid/vivid-vbi-out.c
+++ b/drivers/media/test-drivers/vivid/vivid-vbi-out.c
@@ -30,9 +30,6 @@ static int vbi_out_queue_setup(struct vb2_queue *vq,
 
        sizes[0] = size;
 
-       if (vq->num_buffers + *nbuffers < 2)
-               *nbuffers = 2 - vq->num_buffers;
-
        *nplanes = 1;
        return 0;
 }

diff --git a/drivers/media/test-drivers/vivid/vivid-vid-cap.c b/drivers/media/test-drivers/vivid/vivid-vid-cap.c
index 3a06df35a2d7ceeffb081ebd543efd2cd7abfbb9..2804975fe2787454808ff774e8859cdae3bbd175 100644 (file)
--- a/drivers/media/test-drivers/vivid/vivid-vid-cap.c
+++ b/drivers/media/test-drivers/vivid/vivid-vid-cap.c
@@ -117,9 +117,6 @@ static int vid_cap_queue_setup(struct vb2_queue *vq,
                                        dev->fmt_cap->data_offset[p];
        }
 
-       if (vq->num_buffers + *nbuffers < 2)
-               *nbuffers = 2 - vq->num_buffers;
-
        *nplanes = buffers;
 
        dprintk(dev, 1, "%s: count=%d\n", __func__, *nbuffers);

diff --git a/drivers/media/test-drivers/vivid/vivid-vid-out.c b/drivers/media/test-drivers/vivid/vivid-vid-out.c
index 184a6df2c29fe20d58f46b2de8da8b01221a9844..1653b2988f7e351313e439bee6303c4a27c97d4e 100644 (file)
--- a/drivers/media/test-drivers/vivid/vivid-vid-out.c
+++ b/drivers/media/test-drivers/vivid/vivid-vid-out.c
@@ -73,12 +73,9 @@ static int vid_out_queue_setup(struct vb2_queue *vq,
                                       vfmt->data_offset[p] : size;
        }
 
-       if (vq->num_buffers + *nbuffers < 2)
-               *nbuffers = 2 - vq->num_buffers;
-
        *nplanes = planes;
 
-       dprintk(dev, 1, "%s: count=%d\n", __func__, *nbuffers);
+       dprintk(dev, 1, "%s: count=%u\n", __func__, *nbuffers);
        for (p = 0; p < planes; p++)
                dprintk(dev, 1, "%s: size[%u]=%u\n", __func__, p, sizes[p]);
        return 0;