1 files changed, 13 insertions, 3 deletions

diff --git a/drivers/media/platform/s5p-fimc/fimc-m2m.c b/drivers/media/platform/s5p-fimc/fimc-m2m.c
index 62afed3162ea..1d21da4bd24b 100644
--- a/drivers/media/platform/s5p-fimc/fimc-m2m.c
+++ b/drivers/media/platform/s5p-fimc/fimc-m2m.c
@@ -105,7 +105,7 @@ static void fimc_device_run(void *priv)
         struct fimc_frame *sf, *df;
         struct fimc_dev *fimc;
         unsigned long flags;
-        u32 ret;
+        int ret;
 
         if (WARN(!ctx, "Null context\n"))
                 return;
@@ -439,6 +439,15 @@ static int fimc_m2m_dqbuf(struct file *file, void *fh,
         return v4l2_m2m_dqbuf(file, ctx->m2m_ctx, buf);
 }
 
+static int fimc_m2m_expbuf(struct file *file, void *fh,
+                            struct v4l2_exportbuffer *eb)
+{
+        struct fimc_ctx *ctx = fh_to_ctx(fh);
+
+        return v4l2_m2m_expbuf(file, ctx->m2m_ctx, eb);
+}
+
+
 static int fimc_m2m_streamon(struct file *file, void *fh,
                              enum v4l2_buf_type type)
 {
@@ -607,6 +616,7 @@ static const struct v4l2_ioctl_ops fimc_m2m_ioctl_ops = {
         .vidioc_querybuf                = fimc_m2m_querybuf,
         .vidioc_qbuf                    = fimc_m2m_qbuf,
         .vidioc_dqbuf                   = fimc_m2m_dqbuf,
+        .vidioc_expbuf                  = fimc_m2m_expbuf,
         .vidioc_streamon                = fimc_m2m_streamon,
         .vidioc_streamoff               = fimc_m2m_streamoff,
         .vidioc_g_crop                  = fimc_m2m_g_crop,
@@ -622,7 +632,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
         int ret;
 
         src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-        src_vq->io_modes = VB2_MMAP | VB2_USERPTR;
+        src_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
         src_vq->drv_priv = ctx;
         src_vq->ops = &fimc_qops;
         src_vq->mem_ops = &vb2_dma_contig_memops;
@@ -633,7 +643,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
                 return ret;
 
         dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-        dst_vq->io_modes = VB2_MMAP | VB2_USERPTR;
+        dst_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
         dst_vq->drv_priv = ctx;
         dst_vq->ops = &fimc_qops;
         dst_vq->mem_ops = &vb2_dma_contig_memops;