From 8b9f2fc8399eacd9d45c491273f38010f7cbeb44 Mon Sep 17 00:00:00 2001 From: Javier Martin Date: Tue, 20 Mar 2012 11:33:59 -0300 Subject: [PATCH] --- yaml --- r: 306136 b: refs/heads/master c: 28638601cf2440a7335eb2478b773dcc63e29e7e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/mx2_emmaprp.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cb9c2b3cbda2..964b2814f28c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f443d5878a45933e9924f755bcad28e3732e1750 +refs/heads/master: 28638601cf2440a7335eb2478b773dcc63e29e7e diff --git a/trunk/drivers/media/video/mx2_emmaprp.c b/trunk/drivers/media/video/mx2_emmaprp.c index ba89a7401c8c..55ac1735e85b 100644 --- a/trunk/drivers/media/video/mx2_emmaprp.c +++ b/trunk/drivers/media/video/mx2_emmaprp.c @@ -755,7 +755,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, memset(src_vq, 0, sizeof(*src_vq)); src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT; - src_vq->io_modes = VB2_MMAP; + src_vq->io_modes = VB2_MMAP | VB2_USERPTR; src_vq->drv_priv = ctx; src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); src_vq->ops = &emmaprp_qops; @@ -767,7 +767,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, memset(dst_vq, 0, sizeof(*dst_vq)); dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - dst_vq->io_modes = VB2_MMAP; + dst_vq->io_modes = VB2_MMAP | VB2_USERPTR; dst_vq->drv_priv = ctx; dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer); dst_vq->ops = &emmaprp_qops;