Commit f5131d5c authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Hans Verkuil
Browse files

media: test-drivers: Set REQBUFS minimum number of buffers 



Instead of using 'min_queued_buffers' field to specify the
minimum number of buffers to be allocated when calling REQBUF
use 'min_reqbufs_allocation' field which is dedicated to this
purpose.

Change the minimum requested buffers to 2 for vivid-meta-out
and vivid-touch-cap drivers when creating the queues.
That allows to remove code which prohibe to allocate only
one buffer in their respective queue setup functions.

While at it rename vivid_create_queue() parameter.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 6662edcd

drivers/media/test-drivers/vimc/vimc-capture.c

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ static struct vimc_ent_device *vimc_capture_add(struct vimc_device *vimc, 
	q->mem_ops = vimc_allocator == VIMC_ALLOCATOR_DMA_CONTIG

		   ? &vb2_dma_contig_memops : &vb2_vmalloc_memops;

	q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

	q->min_queued_buffers = 2;

	q->min_reqbufs_allocation = 2;

	q->lock = &vcapture->lock;

	q->dev = v4l2_dev->dev;

drivers/media/test-drivers/vivid/vivid-core.c

+4 −4
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ static const struct media_device_ops vivid_media_ops = { 
static int vivid_create_queue(struct vivid_dev *dev,

			      struct vb2_queue *q,

			      u32 buf_type,

			      unsigned int min_queued_buffers,

			      unsigned int min_reqbufs_allocation,

			      const struct vb2_ops *ops)

{

	if (buf_type == V4L2_BUF_TYPE_VIDEO_CAPTURE && dev->multiplanar)
@@ -898,7 +898,7 @@ static int vivid_create_queue(struct vivid_dev *dev, 
	q->mem_ops = allocators[dev->inst] == 1 ? &vb2_dma_contig_memops :

						  &vb2_vmalloc_memops;

	q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

	q->min_queued_buffers = supports_requests[dev->inst] ? 0 : min_queued_buffers;

	q->min_reqbufs_allocation = min_reqbufs_allocation;

	q->lock = &dev->mutex;

	q->dev = dev->v4l2_dev.dev;

	q->supports_requests = supports_requests[dev->inst];
@@ -1364,7 +1364,7 @@ static int vivid_create_queues(struct vivid_dev *dev) 
	if (dev->has_meta_out) {

		/* initialize meta_out queue */

		ret = vivid_create_queue(dev, &dev->vb_meta_out_q,

					 V4L2_BUF_TYPE_META_OUTPUT, 1,

					 V4L2_BUF_TYPE_META_OUTPUT, 2,

					 &vivid_meta_out_qops);

		if (ret)

			return ret;
@@ -1373,7 +1373,7 @@ static int vivid_create_queues(struct vivid_dev *dev) 
	if (dev->has_touch_cap) {

		/* initialize touch_cap queue */

		ret = vivid_create_queue(dev, &dev->vb_touch_cap_q,

					 V4L2_BUF_TYPE_VIDEO_CAPTURE, 1,

					 V4L2_BUF_TYPE_VIDEO_CAPTURE, 2,

					 &vivid_touch_cap_qops);

		if (ret)

			return ret;

drivers/media/test-drivers/vivid/vivid-meta-out.c

+0 −4
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 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))
@@ -31,9 +30,6 @@ static int meta_out_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, 
		sizes[0] = size;

	}



	if (q_num_bufs + *nbuffers < 2)

		*nbuffers = 2 - q_num_bufs;



	*nplanes = 1;

	return 0;

}

drivers/media/test-drivers/vivid/vivid-touch-cap.c

+0 −4
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 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;
@@ -24,9 +23,6 @@ static int touch_cap_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, 
		sizes[0] = size;

	}



	if (q_num_bufs + *nbuffers < 2)

		*nbuffers = 2 - q_num_bufs;



	*nplanes = 1;

	return 0;

}