Commit 3f9ea948 authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Mauro Carvalho Chehab
Browse files

media: nxp: 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.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: default avatarAndrzej Pietrasiewicz <andrzej.p@collabora.com>
CC: Rui Miguel Silva <rmfrfs@gmail.com>
CC: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
CC: Martin Kepplinger <martink@posteo.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent efd7ae5d

drivers/media/platform/nxp/imx7-media-csi.c

+4 −3
Original line number Diff line number Diff line
@@ -1245,6 +1245,7 @@ static int imx7_csi_video_queue_setup(struct vb2_queue *vq, 
				      struct device *alloc_devs[])

{

	struct imx7_csi *csi = vb2_get_drv_priv(vq);

	unsigned int q_num_bufs = vb2_get_num_buffers(vq);

	struct v4l2_pix_format *pix = &csi->vdev_fmt;

	unsigned int count = *nbuffers;
@@ -1254,14 +1255,14 @@ static int imx7_csi_video_queue_setup(struct vb2_queue *vq, 
	if (*nplanes) {

		if (*nplanes != 1 || sizes[0] < pix->sizeimage)

			return -EINVAL;

		count += vq->num_buffers;

		count += q_num_bufs;

	}



	count = min_t(__u32, IMX7_CSI_VIDEO_MEM_LIMIT / pix->sizeimage, count);



	if (*nplanes)

		*nbuffers = (count < vq->num_buffers) ? 0 :

			count - vq->num_buffers;

		*nbuffers = (count < q_num_bufs) ? 0 :

			count - q_num_bufs;

	else

		*nbuffers = count;