media: ti: 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.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
CC: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
Reviewed-by: Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/ti/am437x/am437x-vpfe.c b/drivers/media/platform/ti/am437x/am437x-vpfe.c
index 5fa2ea9025d96b919fd456cd6b1943dfaff2239a..f18acf9286a23bb8cf7caf759d0210190d22160e 100644 (file)
--- a/drivers/media/platform/ti/am437x/am437x-vpfe.c
+++ b/drivers/media/platform/ti/am437x/am437x-vpfe.c
@@ -1771,9 +1771,10 @@ static int vpfe_queue_setup(struct vb2_queue *vq,
 {
        struct vpfe_device *vpfe = vb2_get_drv_priv(vq);
        unsigned size = vpfe->fmt.fmt.pix.sizeimage;
+       unsigned int q_num_bufs = vb2_get_num_buffers(vq);
 
-       if (vq->num_buffers + *nbuffers < 3)
-               *nbuffers = 3 - vq->num_buffers;
+       if (q_num_bufs + *nbuffers < 3)
+               *nbuffers = 3 - q_num_bufs;
 
        if (*nplanes) {
                if (sizes[0] < size)

diff --git a/drivers/media/platform/ti/cal/cal-video.c b/drivers/media/platform/ti/cal/cal-video.c
index a8abcd0fee17e53803690f8352d905c00f70fd46..94e67c057a203bf0c41109026be89df3909eb441 100644 (file)
--- a/drivers/media/platform/ti/cal/cal-video.c
+++ b/drivers/media/platform/ti/cal/cal-video.c
@@ -603,9 +603,10 @@ static int cal_queue_setup(struct vb2_queue *vq,
 {
        struct cal_ctx *ctx = vb2_get_drv_priv(vq);
        unsigned int size = ctx->v_fmt.fmt.pix.sizeimage;
+       unsigned int q_num_bufs = vb2_get_num_buffers(vq);
 
-       if (vq->num_buffers + *nbuffers < 3)
-               *nbuffers = 3 - vq->num_buffers;
+       if (q_num_bufs + *nbuffers < 3)
+               *nbuffers = 3 - q_num_bufs;
 
        if (*nplanes) {
                if (sizes[0] < size)

diff --git a/drivers/media/platform/ti/davinci/vpif_capture.c b/drivers/media/platform/ti/davinci/vpif_capture.c
index 99fae8830c41deabad0bb6a53b058b8e29bc54c7..fc42b4bc37e6440c451ae2ddf996b182765ec369 100644 (file)
--- a/drivers/media/platform/ti/davinci/vpif_capture.c
+++ b/drivers/media/platform/ti/davinci/vpif_capture.c
@@ -113,6 +113,7 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq,
        struct channel_obj *ch = vb2_get_drv_priv(vq);
        struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
        unsigned size = common->fmt.fmt.pix.sizeimage;
+       unsigned int q_num_bufs = vb2_get_num_buffers(vq);
 
        vpif_dbg(2, debug, "vpif_buffer_setup\n");
 
@@ -122,8 +123,8 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq,
                size = sizes[0];
        }
 
-       if (vq->num_buffers + *nbuffers < 3)
-               *nbuffers = 3 - vq->num_buffers;
+       if (q_num_bufs + *nbuffers < 3)
+               *nbuffers = 3 - q_num_bufs;
 
        *nplanes = 1;
        sizes[0] = size;

diff --git a/drivers/media/platform/ti/davinci/vpif_display.c b/drivers/media/platform/ti/davinci/vpif_display.c
index f8ec2991c667488b4c264e10376b6714a77167d3..9dbab1003c1d9aae7453b1fc84adf16e148fa112 100644 (file)
--- a/drivers/media/platform/ti/davinci/vpif_display.c
+++ b/drivers/media/platform/ti/davinci/vpif_display.c
@@ -115,6 +115,7 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq,
        struct channel_obj *ch = vb2_get_drv_priv(vq);
        struct common_obj *common = &ch->common[VPIF_VIDEO_INDEX];
        unsigned size = common->fmt.fmt.pix.sizeimage;
+       unsigned int q_num_bufs = vb2_get_num_buffers(vq);
 
        if (*nplanes) {
                if (sizes[0] < size)
@@ -122,8 +123,8 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq,
                size = sizes[0];
        }
 
-       if (vq->num_buffers + *nbuffers < 3)
-               *nbuffers = 3 - vq->num_buffers;
+       if (q_num_bufs + *nbuffers < 3)
+               *nbuffers = 3 - q_num_bufs;
 
        *nplanes = 1;
        sizes[0] = size;

diff --git a/drivers/media/platform/ti/omap/omap_vout.c b/drivers/media/platform/ti/omap/omap_vout.c
index 4143274089c34dd6810ad9c77ed1a0aed08cfad2..72ce903717d364faadb6c56417f64a2af4e2f6e6 100644 (file)
--- a/drivers/media/platform/ti/omap/omap_vout.c
+++ b/drivers/media/platform/ti/omap/omap_vout.c
@@ -944,10 +944,11 @@ static int omap_vout_vb2_queue_setup(struct vb2_queue *vq,
                                     struct device *alloc_devs[])
 {
        struct omap_vout_device *vout = vb2_get_drv_priv(vq);
+       unsigned int q_num_bufs = vb2_get_num_buffers(vq);
        int size = vout->pix.sizeimage;
 
-       if (is_rotation_enabled(vout) && vq->num_buffers + *nbufs > VRFB_NUM_BUFS) {
-               *nbufs = VRFB_NUM_BUFS - vq->num_buffers;
+       if (is_rotation_enabled(vout) && q_num_bufs + *nbufs > VRFB_NUM_BUFS) {
+               *nbufs = VRFB_NUM_BUFS - q_num_bufs;
                if (*nbufs == 0)
                        return -EINVAL;
        }