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

Commit 9f183020 authored Dec 14, 2015 by Hans Verkuil Committed by Mauro Carvalho Chehab Feb 01, 2016

[media] saa7134: add DMABUF support



Since saa7134 is now using vb2, there is no reason why we can't support
dmabuf for this driver.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

parent ff880348

drivers/media/pci/saa7134/saa7134-empress.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -189,6 +189,7 @@ static const struct v4l2_ioctl_ops ts_ioctl_ops = {
		.vidioc_querybuf = vb2_ioctl_querybuf,
		.vidioc_qbuf = vb2_ioctl_qbuf,
		.vidioc_dqbuf = vb2_ioctl_dqbuf,
		.vidioc_expbuf = vb2_ioctl_expbuf,
		.vidioc_streamon = vb2_ioctl_streamon,
		.vidioc_streamoff = vb2_ioctl_streamoff,
		.vidioc_g_frequency = saa7134_g_frequency,
		@@ -286,7 +287,7 @@ static int empress_init(struct saa7134_dev *dev)
		* transfers that do not start at the beginning of a page. A USERPTR
		* can start anywhere in a page, so USERPTR support is a no-go.
		*/
		q->io_modes = VB2_MMAP \| VB2_READ;
		q->io_modes = VB2_MMAP \| VB2_DMABUF \| VB2_READ;
		q->drv_priv = &dev->ts_q;
		q->ops = &saa7134_empress_qops;
		q->gfp_flags = GFP_DMA32;

drivers/media/pci/saa7134/saa7134-video.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1906,6 +1906,7 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
		.vidioc_querybuf = vb2_ioctl_querybuf,
		.vidioc_qbuf = vb2_ioctl_qbuf,
		.vidioc_dqbuf = vb2_ioctl_dqbuf,
		.vidioc_expbuf = vb2_ioctl_expbuf,
		.vidioc_s_std = saa7134_s_std,
		.vidioc_g_std = saa7134_g_std,
		.vidioc_querystd = saa7134_querystd,
		@@ -2089,7 +2090,7 @@ int saa7134_video_init1(struct saa7134_dev *dev)
		* USERPTR support is a no-go unless the application knows about these
		* limitations and has special support for this.
		*/
		q->io_modes = VB2_MMAP \| VB2_READ;
		q->io_modes = VB2_MMAP \| VB2_DMABUF \| VB2_READ;
		if (saa7134_userptr)
		q->io_modes \|= VB2_USERPTR;
		q->drv_priv = &dev->video_q;