[media] vb2: drop v4l2_format argument from queue_setup

The queue_setup callback has a void pointer that is just for V4L2
and is the pointer to the v4l2_format struct that was passed to
VIDIOC_CREATE_BUFS. The idea was that drivers would use the information
from that struct to buffers suitable for the requested format.

After the vb2 split series this pointer is now a void pointer,
which is ugly, and the reality is that all existing drivers will
effectively just look at the sizeimage field of v4l2_format.

To make this more generic the queue_setup callback is changed:
the void pointer is dropped, instead if the *num_planes argument
is 0, then use the current format size, if it is non-zero, then
it contains the number of requested planes and the sizes array
contains the requested sizes. If either is unsupported, then return
-EINVAL, otherwise use the requested size(s).

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/media/pci/tw68/tw68-video.c b/drivers/media/pci/tw68/tw68-video.c
index 46642ef9151b..2e71af15ddb0 100644
--- a/drivers/media/pci/tw68/tw68-video.c
+++ b/drivers/media/pci/tw68/tw68-video.c
@@ -376,28 +376,28 @@ static int tw68_buffer_count(unsigned int size, unsigned int count)
 /* ------------------------------------------------------------- */
 /* vb2 queue operations                                          */
 
-static int tw68_queue_setup(struct vb2_queue *q, const void *parg,
+static int tw68_queue_setup(struct vb2_queue *q,
                            unsigned int *num_buffers, unsigned int *num_planes,
                            unsigned int sizes[], void *alloc_ctxs[])
 {
-        const struct v4l2_format *fmt = parg;
         struct tw68_dev *dev = vb2_get_drv_priv(q);
         unsigned tot_bufs = q->num_buffers + *num_buffers;
+        unsigned size = (dev->fmt->depth * dev->width * dev->height) >> 3;
 
-        sizes[0] = (dev->fmt->depth * dev->width * dev->height) >> 3;
+        if (tot_bufs < 2)
+                tot_bufs = 2;
+        tot_bufs = tw68_buffer_count(size, tot_bufs);
+        *num_buffers = tot_bufs - q->num_buffers;
         alloc_ctxs[0] = dev->alloc_ctx;
         /*
-         * We allow create_bufs, but only if the sizeimage is the same as the
+         * We allow create_bufs, but only if the sizeimage is >= as the
          * current sizeimage. The tw68_buffer_count calculation becomes quite
          * difficult otherwise.
          */
-        if (fmt && fmt->fmt.pix.sizeimage < sizes[0])
-                return -EINVAL;
+        if (*num_planes)
+                return sizes[0] < size ? -EINVAL : 0;
         *num_planes = 1;
-        if (tot_bufs < 2)
-                tot_bufs = 2;
-        tot_bufs = tw68_buffer_count(sizes[0], tot_bufs);
-        *num_buffers = tot_bufs - q->num_buffers;
+        sizes[0] = size;
 
         return 0;
 }