summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorTomasz Stanislawski <t.stanislaws@samsung.com>2012-06-14 10:37:48 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-11-25 17:20:07 -0200
commitfa77521fe525ce1d7e4f099e58c1d64a136d252b (patch)
tree62425833ca1406d163dabb5e42a4d73382ae629e /drivers/media
parentb0a55033adc03d7d6a1f4693ed916e97c733e526 (diff)
downloadlinux-stable-fa77521fe525ce1d7e4f099e58c1d64a136d252b.tar.gz
linux-stable-fa77521fe525ce1d7e4f099e58c1d64a136d252b.tar.bz2
linux-stable-fa77521fe525ce1d7e4f099e58c1d64a136d252b.zip
[media] v4l: s5p-tv: mixer: support for dmabuf importing
This patch enhances s5p-tv 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: 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/s5p-tv/mixer_video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
index 9b52f3a48c27..79a7ea3ae04a 100644
--- a/drivers/media/platform/s5p-tv/mixer_video.c
+++ b/drivers/media/platform/s5p-tv/mixer_video.c
@@ -1092,7 +1092,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
layer->vb_queue = (struct vb2_queue) {
.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
- .io_modes = VB2_MMAP | VB2_USERPTR,
+ .io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF,
.drv_priv = layer,
.buf_struct_size = sizeof(struct mxr_buffer),
.ops = &mxr_video_qops,