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

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

[media] marvell-ccic: add DMABUF support for all three DMA modes 



Add VB2_DMABUF and VIDIOC_EXPBUF support. Also add VB2_USERPTR support
for the vmalloc DMA mode which was missing for no good reason.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarJonathan Corbet <corbet@lwn.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent e198d0ff

drivers/media/platform/marvell-ccic/mcam-core.c

+3 −6
Original line number Diff line number Diff line
@@ -1255,14 +1255,14 @@ static int mcam_setup_vb2(struct mcam_camera *cam) 
	vq->drv_priv = cam;

	vq->lock = &cam->s_mutex;

	vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

	vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ;

	vq->buf_struct_size = sizeof(struct mcam_vb_buffer);

	INIT_LIST_HEAD(&cam->buffers);

	switch (cam->buffer_mode) {

	case B_DMA_contig:

#ifdef MCAM_MODE_DMA_CONTIG

		vq->ops = &mcam_vb2_ops;

		vq->mem_ops = &vb2_dma_contig_memops;

		vq->buf_struct_size = sizeof(struct mcam_vb_buffer);

		vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;

		cam->dma_setup = mcam_ctlr_dma_contig;

		cam->frame_complete = mcam_dma_contig_done;

		cam->vb_alloc_ctx = vb2_dma_contig_init_ctx(cam->dev);
@@ -1274,8 +1274,6 @@ static int mcam_setup_vb2(struct mcam_camera *cam) 
#ifdef MCAM_MODE_DMA_SG

		vq->ops = &mcam_vb2_sg_ops;

		vq->mem_ops = &vb2_dma_sg_memops;

		vq->buf_struct_size = sizeof(struct mcam_vb_buffer);

		vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;

		cam->dma_setup = mcam_ctlr_dma_sg;

		cam->frame_complete = mcam_dma_sg_done;

		cam->vb_alloc_ctx_sg = vb2_dma_sg_init_ctx(cam->dev);
@@ -1289,8 +1287,6 @@ static int mcam_setup_vb2(struct mcam_camera *cam) 
				(unsigned long) cam);

		vq->ops = &mcam_vb2_ops;

		vq->mem_ops = &vb2_vmalloc_memops;

		vq->buf_struct_size = sizeof(struct mcam_vb_buffer);

		vq->io_modes = VB2_MMAP | VB2_READ;

		cam->dma_setup = mcam_ctlr_dma_vmalloc;

		cam->frame_complete = mcam_vmalloc_done;

#endif
@@ -1579,6 +1575,7 @@ static const struct v4l2_ioctl_ops mcam_v4l_ioctl_ops = { 
	.vidioc_querybuf	= vb2_ioctl_querybuf,

	.vidioc_qbuf		= vb2_ioctl_qbuf,

	.vidioc_dqbuf		= vb2_ioctl_dqbuf,

	.vidioc_expbuf		= vb2_ioctl_expbuf,

	.vidioc_streamon	= vb2_ioctl_streamon,

	.vidioc_streamoff	= vb2_ioctl_streamoff,

	.vidioc_g_parm		= mcam_vidioc_g_parm,