aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorTomasz Stanislawski <t.stanislaws@samsung.com>2012-06-14 09:37:49 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-11-25 14:19:45 -0500
commitb0a55033adc03d7d6a1f4693ed916e97c733e526 (patch)
tree63d9c60418bb51da80e41b9518d1dcc59714043a /drivers/media/platform
parentccc4c539c05fe513800b508531db3b404f56d395 (diff)
[media] v4l: mem2mem_testdev: add support for dmabuf importing
This patch enhances mem2mem_testdev device with support for DMABUF importing via V4L2_MEMORY_DMABUF memory type. Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/mem2mem_testdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/platform/mem2mem_testdev.c b/drivers/media/platform/mem2mem_testdev.c
index 2e2121e98133..7487d7208dea 100644
--- a/drivers/media/platform/mem2mem_testdev.c
+++ b/drivers/media/platform/mem2mem_testdev.c
@@ -839,7 +839,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *ds
839 int ret; 839 int ret;
840 840
841 src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT; 841 src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
842 src_vq->io_modes = VB2_MMAP; 842 src_vq->io_modes = VB2_MMAP | VB2_DMABUF;
843 src_vq->drv_priv = ctx; 843 src_vq->drv_priv = ctx;
844 src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); 844 src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
845 src_vq->ops = &m2mtest_qops; 845 src_vq->ops = &m2mtest_qops;
@@ -850,7 +850,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *ds
850 return ret; 850 return ret;
851 851
852 dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; 852 dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
853 dst_vq->io_modes = VB2_MMAP; 853 dst_vq->io_modes = VB2_MMAP | VB2_DMABUF;
854 dst_vq->drv_priv = ctx; 854 dst_vq->drv_priv = ctx;
855 dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); 855 dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
856 dst_vq->ops = &m2mtest_qops; 856 dst_vq->ops = &m2mtest_qops;