Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fa9dd06 authored by Tomasz Stanislawski's avatar Tomasz Stanislawski Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: s5p-mfc: support for dmabuf exporting 



This patch enhances s5p-mfc with support for DMABUF exporting via
VIDIOC_EXPBUF ioctl.

Signed-off-by: default avatarTomasz Stanislawski <t.stanislaws@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Tested-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3c44efd3

drivers/media/platform/s5p-mfc/s5p_mfc_dec.c

+14 −0
Original line number Diff line number Diff line
@@ -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,

drivers/media/platform/s5p-mfc/s5p_mfc_enc.c

+14 −0
Original line number Diff line number Diff line
@@ -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,