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

Commit 9bd09fd7 authored by Tomasz Stanislawski's avatar Tomasz Stanislawski Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: s5p-fimc: support for dmabuf importing 



This patch enhances s5p-fimc with support for DMABUF importing via
V4L2_MEMORY_DMABUF memory type.

Signed-off-by: default avatarTomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Tested-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent fa77521f

drivers/media/platform/s5p-fimc/fimc-capture.c

+1 −1
Original line number Diff line number Diff line
@@ -1730,7 +1730,7 @@ static int fimc_register_capture_device(struct fimc_dev *fimc, 
	q = &fimc->vid_cap.vbq;

	memset(q, 0, sizeof(*q));

	q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;

	q->io_modes = VB2_MMAP | VB2_USERPTR;

	q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;

	q->drv_priv = fimc->vid_cap.ctx;

	q->ops = &fimc_capture_qops;

	q->mem_ops = &vb2_dma_contig_memops;

drivers/media/platform/s5p-fimc/fimc-m2m.c

+2 −2
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, 
	int ret;



	src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;

	src_vq->io_modes = VB2_MMAP | VB2_USERPTR;

	src_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;

	src_vq->drv_priv = ctx;

	src_vq->ops = &fimc_qops;

	src_vq->mem_ops = &vb2_dma_contig_memops;
@@ -633,7 +633,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, 
		return ret;



	dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;

	dst_vq->io_modes = VB2_MMAP | VB2_USERPTR;

	dst_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;

	dst_vq->drv_priv = ctx;

	dst_vq->ops = &fimc_qops;

	dst_vq->mem_ops = &vb2_dma_contig_memops;