Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df9ecb0c authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent ecc2fe20

Documentation/video4linux/v4l2-pci-skeleton.c

+5 −6
Original line number Diff line number Diff line
@@ -163,11 +163,10 @@ static irqreturn_t skeleton_irq(int irq, void *dev_id) 
 * minimum number: many DMA engines need a minimum of 2 buffers in the

 * queue and you need to have another available for userspace processing.

 */

static int queue_setup(struct vb2_queue *vq, const void *parg,

static int queue_setup(struct vb2_queue *vq,

		       unsigned int *nbuffers, unsigned int *nplanes,

		       unsigned int sizes[], void *alloc_ctxs[])

{

	const struct v4l2_format *fmt = parg;

	struct skeleton *skel = vb2_get_drv_priv(vq);



	skel->field = skel->format.field;
@@ -183,12 +182,12 @@ static int queue_setup(struct vb2_queue *vq, const void *parg, 


	if (vq->num_buffers + *nbuffers < 3)

		*nbuffers = 3 - vq->num_buffers;

	alloc_ctxs[0] = skel->alloc_ctx;



	if (fmt && fmt->fmt.pix.sizeimage < skel->format.sizeimage)

		return -EINVAL;

	if (*nplanes)

		return sizes[0] < skel->format.sizeimage ? -EINVAL : 0;

	*nplanes = 1;

	sizes[0] = fmt ? fmt->fmt.pix.sizeimage : skel->format.sizeimage;

	alloc_ctxs[0] = skel->alloc_ctx;

	sizes[0] = skel->format.sizeimage;

	return 0;

}

drivers/input/touchscreen/sur40.c

+5 −6
Original line number Diff line number Diff line
@@ -644,22 +644,21 @@ static void sur40_disconnect(struct usb_interface *interface) 
 * minimum number: many DMA engines need a minimum of 2 buffers in the

 * queue and you need to have another available for userspace processing.

 */

static int sur40_queue_setup(struct vb2_queue *q, const void *parg,

static int sur40_queue_setup(struct vb2_queue *q,

		       unsigned int *nbuffers, unsigned int *nplanes,

		       unsigned int sizes[], void *alloc_ctxs[])

{

	const struct v4l2_format *fmt = parg;

	struct sur40_state *sur40 = vb2_get_drv_priv(q);



	if (q->num_buffers + *nbuffers < 3)

		*nbuffers = 3 - q->num_buffers;

	alloc_ctxs[0] = sur40->alloc_ctx;



	if (fmt && fmt->fmt.pix.sizeimage < sur40_video_format.sizeimage)

		return -EINVAL;

	if (*nplanes)

		return sizes[0] < sur40_video_format.sizeimage ? -EINVAL : 0;



	*nplanes = 1;

	sizes[0] = fmt ? fmt->fmt.pix.sizeimage : sur40_video_format.sizeimage;

	alloc_ctxs[0] = sur40->alloc_ctx;

	sizes[0] = sur40_video_format.sizeimage;



	return 0;

}

drivers/media/dvb-frontends/rtl2832_sdr.c

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ static int rtl2832_sdr_querycap(struct file *file, void *fh, 


/* Videobuf2 operations */

static int rtl2832_sdr_queue_setup(struct vb2_queue *vq,

		const void *parg, unsigned int *nbuffers,

		unsigned int *nbuffers,

		unsigned int *nplanes, unsigned int sizes[], void *alloc_ctxs[])

{

	struct rtl2832_sdr_dev *dev = vb2_get_drv_priv(vq);

drivers/media/pci/cobalt/cobalt-v4l2.c

+4 −8
Original line number Diff line number Diff line
@@ -43,11 +43,10 @@ static const struct v4l2_dv_timings cea1080p60 = V4L2_DV_BT_CEA_1920X1080P60; 


/* vb2 DMA streaming ops */



static int cobalt_queue_setup(struct vb2_queue *q, const void *parg,

static int cobalt_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 cobalt_stream *s = q->drv_priv;

	unsigned size = s->stride * s->height;
@@ -55,14 +54,11 @@ static int cobalt_queue_setup(struct vb2_queue *q, const void *parg, 
		*num_buffers = 3;

	if (*num_buffers > NR_BUFS)

		*num_buffers = NR_BUFS;

	alloc_ctxs[0] = s->cobalt->alloc_ctx;

	if (*num_planes)

		return sizes[0] < size ? -EINVAL : 0;

	*num_planes = 1;

	if (fmt) {

		if (fmt->fmt.pix.sizeimage < size)

			return -EINVAL;

		size = fmt->fmt.pix.sizeimage;

	}

	sizes[0] = size;

	alloc_ctxs[0] = s->cobalt->alloc_ctx;

	return 0;

}

drivers/media/pci/cx23885/cx23885-417.c

+1 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,7 @@ static int cx23885_initialize_codec(struct cx23885_dev *dev, int startencoder) 


/* ------------------------------------------------------------------ */



static int queue_setup(struct vb2_queue *q, const void *parg,

static int queue_setup(struct vb2_queue *q,

			   unsigned int *num_buffers, unsigned int *num_planes,

			   unsigned int sizes[], void *alloc_ctxs[])

{