From: Laurent Pinchart Date: Thu, 14 Nov 2013 04:03:10 +0000 (-0300) Subject: [media] v4l: omap4iss: Enable DMABUF support X-Git-Tag: firefly_0821_release~176^2~795^2~1717 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3e90f789739e5685da0d0b716b04e49e17671877;p=firefly-linux-kernel-4.4.55.git [media] v4l: omap4iss: Enable DMABUF support Enable DMABUF import and export operations using videobuf2. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c index cdee5966cbca..2085f699da67 100644 --- a/drivers/staging/media/omap4iss/iss_video.c +++ b/drivers/staging/media/omap4iss/iss_video.c @@ -772,6 +772,14 @@ iss_video_qbuf(struct file *file, void *fh, struct v4l2_buffer *b) return vb2_qbuf(&vfh->queue, b); } +static int +iss_video_expbuf(struct file *file, void *fh, struct v4l2_exportbuffer *e) +{ + struct iss_video_fh *vfh = to_iss_video_fh(fh); + + return vb2_expbuf(&vfh->queue, e); +} + static int iss_video_dqbuf(struct file *file, void *fh, struct v4l2_buffer *b) { @@ -1021,6 +1029,7 @@ static const struct v4l2_ioctl_ops iss_video_ioctl_ops = { .vidioc_reqbufs = iss_video_reqbufs, .vidioc_querybuf = iss_video_querybuf, .vidioc_qbuf = iss_video_qbuf, + .vidioc_expbuf = iss_video_expbuf, .vidioc_dqbuf = iss_video_dqbuf, .vidioc_streamon = iss_video_streamon, .vidioc_streamoff = iss_video_streamoff, @@ -1071,7 +1080,7 @@ static int iss_video_open(struct file *file) q = &handle->queue; q->type = video->type; - q->io_modes = VB2_MMAP; + q->io_modes = VB2_MMAP | VB2_DMABUF; q->drv_priv = handle; q->ops = &iss_video_vb2ops; q->mem_ops = &vb2_dma_contig_memops;