vb2 queue_setup checks for a minimum number of buffers so set
min_buffers_needed to 16 and remove the useless check in
rcar_drif_queue_setup().
Signed-off-by: Benjamin Gaignard <benjamin.gaignard@xxxxxxxxxxxxx>
CC: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
---
drivers/media/platform/renesas/rcar_drif.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/media/platform/renesas/rcar_drif.c b/drivers/media/platform/renesas/rcar_drif.c
index 292c5bf9e50c..bb84fc089d5d 100644
--- a/drivers/media/platform/renesas/rcar_drif.c
+++ b/drivers/media/platform/renesas/rcar_drif.c
@@ -425,13 +425,9 @@ static int rcar_drif_queue_setup(struct vb2_queue *vq,
{
struct rcar_drif_sdr *sdr = vb2_get_drv_priv(vq);
- /* Need at least 16 buffers */
- if (vq->num_buffers + *num_buffers < 16)
- *num_buffers = 16 - vq->num_buffers;
-
*num_planes = 1;
sizes[0] = PAGE_ALIGN(sdr->fmt->buffersize);
- rdrif_dbg(sdr, "num_bufs %d sizes[0] %d\n", *num_buffers, sizes[0]);
+ rdrif_dbg(sdr, "num_bufs %u sizes[0] %d\n", vb2_get_num_buffers(vq), sizes[0]);
return 0;
}
@@ -1310,6 +1306,8 @@ static int rcar_drif_sdr_probe(struct rcar_drif_sdr *sdr)
/* Init videobuf2 queue structure */
sdr->vb_queue.type = V4L2_BUF_TYPE_SDR_CAPTURE;
sdr->vb_queue.io_modes = VB2_READ | VB2_MMAP | VB2_DMABUF;
+ /* Need at least 16 buffers */
+ sdr->vb_queue.min_buffers_needed = 16;
sdr->vb_queue.drv_priv = sdr;
sdr->vb_queue.buf_struct_size = sizeof(struct rcar_drif_frame_buf);
sdr->vb_queue.ops = &rcar_drif_vb2_ops;
--
2.39.2
