From: Hans Verkuil Date: Tue, 18 Nov 2014 12:51:06 +0000 (-0300) Subject: [media] vivid: enable vb2_expbuf support X-Git-Tag: v3.19-rc1~126^2~86 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=952768c41a993dc1d813baa29d87ecb3da9b266e;p=karo-tx-linux.git [media] vivid: enable vb2_expbuf support Now that vb2 supports DMABUF export for dma-sg and vmalloc memory modes, we can enable the vb2_expbuf support in vivid. Signed-off-by: Hans Verkuil Reviewed-by: Pawel Osciak Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c index 987a46cdea5e..a7e033a5d291 100644 --- a/drivers/media/platform/vivid/vivid-core.c +++ b/drivers/media/platform/vivid/vivid-core.c @@ -572,7 +572,7 @@ static const struct v4l2_ioctl_ops vivid_ioctl_ops = { .vidioc_querybuf = vb2_ioctl_querybuf, .vidioc_qbuf = vb2_ioctl_qbuf, .vidioc_dqbuf = vb2_ioctl_dqbuf, -/* Not yet .vidioc_expbuf = vb2_ioctl_expbuf,*/ + .vidioc_expbuf = vb2_ioctl_expbuf, .vidioc_streamon = vb2_ioctl_streamon, .vidioc_streamoff = vb2_ioctl_streamoff,