2 files changed, 28 insertions, 0 deletions

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
index eb6a70b0f821..6dad9a74f61c 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@ -636,6 +636,19 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
         return -EINVAL;
 }
 
+/* Export DMA buffer */
+static int vidioc_expbuf(struct file *file, void *priv,
+        struct v4l2_exportbuffer *eb)
+{
+        struct s5p_mfc_ctx *ctx = fh_to_ctx(priv);
+
+        if (eb->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
+                return vb2_expbuf(&ctx->vq_src, eb);
+        if (eb->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
+                return vb2_expbuf(&ctx->vq_dst, eb);
+        return -EINVAL;
+}
+
 /* Stream on */
 static int vidioc_streamon(struct file *file, void *priv,
                            enum v4l2_buf_type type)
@@ -813,6 +826,7 @@ static const struct v4l2_ioctl_ops s5p_mfc_dec_ioctl_ops = {
         .vidioc_querybuf = vidioc_querybuf,
         .vidioc_qbuf = vidioc_qbuf,
         .vidioc_dqbuf = vidioc_dqbuf,
+        .vidioc_expbuf = vidioc_expbuf,
         .vidioc_streamon = vidioc_streamon,
         .vidioc_streamoff = vidioc_streamoff,
         .vidioc_g_crop = vidioc_g_crop,
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
index 5c1d727268be..f92f6ddd739f 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -1165,6 +1165,19 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf)
         return ret;
 }
 
+/* Export DMA buffer */
+static int vidioc_expbuf(struct file *file, void *priv,
+        struct v4l2_exportbuffer *eb)
+{
+        struct s5p_mfc_ctx *ctx = fh_to_ctx(priv);
+
+        if (eb->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
+                return vb2_expbuf(&ctx->vq_src, eb);
+        if (eb->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)
+                return vb2_expbuf(&ctx->vq_dst, eb);
+        return -EINVAL;
+}
+
 /* Stream on */
 static int vidioc_streamon(struct file *file, void *priv,
                            enum v4l2_buf_type type)
@@ -1568,6 +1581,7 @@ static const struct v4l2_ioctl_ops s5p_mfc_enc_ioctl_ops = {
         .vidioc_querybuf = vidioc_querybuf,
         .vidioc_qbuf = vidioc_qbuf,
         .vidioc_dqbuf = vidioc_dqbuf,
+        .vidioc_expbuf = vidioc_expbuf,
         .vidioc_streamon = vidioc_streamon,
         .vidioc_streamoff = vidioc_streamoff,
         .vidioc_s_parm = vidioc_s_parm,