aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-03-10 09:58:26 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-03-11 09:31:19 -0400
commit782f36ca697034b43177b0d7e05d691f6bce120f (patch)
treeed4b4511bf908f5f3002fa32bb9fd11f557d2c5b /drivers/media/platform
parentf063bb6638c5337929d091c0d3abdbd049f829ba (diff)
[media] mem2mem_testdev: add USERPTR support
There is no reason why we shouldn't enable this here. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.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 c4b54f8ac573..8e2aed27bf64 100644
--- a/drivers/media/platform/mem2mem_testdev.c
+++ b/drivers/media/platform/mem2mem_testdev.c
@@ -782,7 +782,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *ds
782 int ret; 782 int ret;
783 783
784 src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT; 784 src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
785 src_vq->io_modes = VB2_MMAP | VB2_DMABUF; 785 src_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
786 src_vq->drv_priv = ctx; 786 src_vq->drv_priv = ctx;
787 src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); 787 src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
788 src_vq->ops = &m2mtest_qops; 788 src_vq->ops = &m2mtest_qops;
@@ -795,7 +795,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *ds
795 return ret; 795 return ret;
796 796
797 dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; 797 dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
798 dst_vq->io_modes = VB2_MMAP | VB2_DMABUF; 798 dst_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
799 dst_vq->drv_priv = ctx; 799 dst_vq->drv_priv = ctx;
800 dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); 800 dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
801 dst_vq->ops = &m2mtest_qops; 801 dst_vq->ops = &m2mtest_qops;