summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorTomasz Stanislawski <t.stanislaws@samsung.com>2012-06-14 10:37:47 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-11-25 17:19:19 -0200
commita626f0ac9dec1d28d16f62eed6f5ea0879ddb4e0 (patch)
treecad57e2ed1b93e532cdc890a602b8beae421cf81 /drivers/media
parent89d2ee08909836b218de6d5baa99a56a9df05a6e (diff)
downloadlinux-stable-a626f0ac9dec1d28d16f62eed6f5ea0879ddb4e0.tar.gz
linux-stable-a626f0ac9dec1d28d16f62eed6f5ea0879ddb4e0.tar.bz2
linux-stable-a626f0ac9dec1d28d16f62eed6f5ea0879ddb4e0.zip
[media] v4l: vivi: support for dmabuf importing
This patch enhances VIVI driver with a support for importing a buffer from DMABUF file descriptors. Signed-off-by: Tomasz Stanislawski <t.stanislaws@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Tested-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/vivi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c
index ef0fc276f7e7..0d59b9db83cb 100644
--- a/drivers/media/platform/vivi.c
+++ b/drivers/media/platform/vivi.c
@@ -1302,7 +1302,7 @@ static int __init vivi_create_instance(int inst)
/* initialize queue */
q = &dev->vb_vidq;
q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
+ q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ;
q->drv_priv = dev;
q->buf_struct_size = sizeof(struct vivi_buffer);
q->ops = &vivi_video_qops;