Commit 46cbe0cd authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Mauro Carvalho Chehab
Browse files

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: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
CC: Daniel Almeida <daniel.almeida@collabora.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 8f661dc7

drivers/media/test-drivers/visl/visl-dec.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

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

+0 −3
Original line number Diff line number Diff line
@@ -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;

}

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

+3 −2
Original line number Diff line number Diff line
@@ -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;

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

+3 −2
Original line number Diff line number Diff line
@@ -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;

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

+0 −3
Original line number Diff line number Diff line
@@ -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;

}