diff options
| author | Tomasz Stanislawski <t.stanislaws@samsung.com> | 2012-04-20 16:45:34 +0200 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@ti.com> | 2012-04-24 16:14:03 +0530 |
| commit | 4cd7db43d454d815c57d2cc171758c1caf540dd9 (patch) | |
| tree | 32b305a8c3511ffd62411cf8144e1a7d6a8155d7 | |
| parent | ce778968c46aee1efcea7604fd56330e2c510df9 (diff) | |
| download | linux-topics-4cd7db43d454d815c57d2cc171758c1caf540dd9.tar.gz | |
v4l: s5p-fimc: support for dmabuf importingtracking-umm-wip-3.4-2012.05-1tracking-umm-wip-3.4-2012.05-0
This patch enhances s5p-fimc with support for DMABUF importing via
V4L2_MEMORY_DMABUF memory type.
Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>
| -rw-r--r-- | drivers/media/video/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/media/video/s5p-fimc/fimc-capture.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index ce1e7ba940f..837e55c7d0b 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -1133,6 +1133,7 @@ config VIDEO_SAMSUNG_S5P_FIMC VIDEO_V4L2_SUBDEV_API && EXPERIMENTAL select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV + select DMA_SHARED_BUFFER ---help--- This is a v4l2 driver for Samsung S5P and EXYNOS4 camera host interface and video postprocessor. diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c index b06efd20832..38fb39e5f4f 100644 --- a/drivers/media/video/s5p-fimc/fimc-capture.c +++ b/drivers/media/video/s5p-fimc/fimc-capture.c @@ -1530,7 +1530,7 @@ 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; |