* Re: [PATCH] media: v4l2: add VB2_DMABUF to all drivers
2020-02-21 8:26 [PATCH] media: v4l2: add VB2_DMABUF to all drivers Hans Verkuil
@ 2020-02-21 8:40 ` Tomasz Figa
2020-02-21 10:36 ` Dave Stevenson
2020-02-21 13:09 ` Laurent Pinchart
2 siblings, 0 replies; 5+ messages in thread
From: Tomasz Figa @ 2020-02-21 8:40 UTC (permalink / raw)
To: Hans Verkuil
Cc: Linux Media Mailing List, Sylwester Nawrocki, Laurent Pinchart,
Maxime Ripard, Dave Stevenson
Hi Hans,
On Fri, Feb 21, 2020 at 5:26 PM Hans Verkuil <hverkuil@xs4all.nl> wrote:
>
> There where still several (usually old) vb2-based drivers that did not
> support DMABUF as streaming mode. There is no reason not to support this,
> so add it throughout the media tree.
There is one thing to be wary of. Some of the hardware, like s5p-mfc,
require all the buffers to be registered before streaming. That's not
possible with DMABUF memory type, because the buffers are known only
after respective QBUF calls and also subsequent QBUF calls with the
same buffer index may queue different DMA-bufs. Care must be taken not
to enable DMABUF for such hardware.
Best regards,
Tomasz
>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> ---
> drivers/media/dvb-frontends/rtl2832_sdr.c | 2 +-
> drivers/media/pci/saa7134/saa7134-video.c | 2 +-
> drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +-
> drivers/media/pci/solo6x10/solo6x10-v4l2.c | 2 +-
> drivers/media/pci/sta2x11/sta2x11_vip.c | 2 +-
> drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +-
> drivers/media/platform/exynos4-is/fimc-lite.c | 2 +-
> drivers/media/platform/omap3isp/ispvideo.c | 2 +-
> drivers/media/platform/s3c-camif/camif-capture.c | 2 +-
> drivers/media/platform/s5p-g2d/g2d.c | 4 ++--
> drivers/media/platform/s5p-jpeg/jpeg-core.c | 4 ++--
> drivers/media/platform/s5p-mfc/s5p_mfc.c | 8 ++++----
> drivers/media/platform/sh_veu.c | 4 ++--
> drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 2 +-
> drivers/media/usb/airspy/airspy.c | 2 +-
> drivers/media/usb/dvb-usb/cxusb-analog.c | 4 ++--
> drivers/media/usb/em28xx/em28xx-video.c | 2 +-
> drivers/media/usb/go7007/go7007-v4l2.c | 2 +-
> drivers/media/usb/msi2500/msi2500.c | 2 +-
> drivers/media/usb/pwc/pwc-if.c | 2 +-
> drivers/media/usb/s2255/s2255drv.c | 2 +-
> drivers/media/usb/usbtv/usbtv-video.c | 2 +-
> drivers/media/usb/uvc/uvc_queue.c | 2 +-
> .../staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 2 +-
> 24 files changed, 31 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c
> index 60d1e59d2292..55ac4b32ea39 100644
> --- a/drivers/media/dvb-frontends/rtl2832_sdr.c
> +++ b/drivers/media/dvb-frontends/rtl2832_sdr.c
> @@ -1359,7 +1359,7 @@ static int rtl2832_sdr_probe(struct platform_device *pdev)
>
> /* Init videobuf2 queue structure */
> dev->vb_queue.type = V4L2_BUF_TYPE_SDR_CAPTURE;
> - dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> dev->vb_queue.drv_priv = dev;
> dev->vb_queue.buf_struct_size = sizeof(struct rtl2832_sdr_frame_buf);
> dev->vb_queue.ops = &rtl2832_sdr_vb2_ops;
> diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
> index 342cabf48064..2d3081dbdf83 100644
> --- a/drivers/media/pci/saa7134/saa7134-video.c
> +++ b/drivers/media/pci/saa7134/saa7134-video.c
> @@ -2133,7 +2133,7 @@ int saa7134_video_init1(struct saa7134_dev *dev)
> q = &dev->vbi_vbq;
> q->type = V4L2_BUF_TYPE_VBI_CAPTURE;
> /* Don't add VB2_USERPTR, see comment above */
> - q->io_modes = VB2_MMAP | VB2_READ;
> + q->io_modes = VB2_MMAP | VB2_READ | VB2_DMABUF;
> if (saa7134_userptr)
> q->io_modes |= VB2_USERPTR;
> q->drv_priv = &dev->vbi_q;
> diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
> index 476d7f3b32d6..d3239d86cead 100644
> --- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
> +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
> @@ -1265,7 +1265,7 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo_dev *solo_dev,
> solo_enc->motion_global = true;
> solo_enc->motion_thresh = SOLO_DEF_MOT_THRESH;
> solo_enc->vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - solo_enc->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + solo_enc->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> solo_enc->vidq.ops = &solo_enc_video_qops;
> solo_enc->vidq.mem_ops = &vb2_dma_sg_memops;
> solo_enc->vidq.drv_priv = solo_enc;
> diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2.c b/drivers/media/pci/solo6x10/solo6x10-v4l2.c
> index 78792067e920..9d290099b7a0 100644
> --- a/drivers/media/pci/solo6x10/solo6x10-v4l2.c
> +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2.c
> @@ -667,7 +667,7 @@ int solo_v4l2_init(struct solo_dev *solo_dev, unsigned nr)
> video_set_drvdata(solo_dev->vfd, solo_dev);
>
> solo_dev->vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - solo_dev->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + solo_dev->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> solo_dev->vidq.ops = &solo_video_qops;
> solo_dev->vidq.mem_ops = &vb2_dma_contig_memops;
> solo_dev->vidq.drv_priv = solo_dev;
> diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c
> index fd3de3bb0c89..b97c13472cb3 100644
> --- a/drivers/media/pci/sta2x11/sta2x11_vip.c
> +++ b/drivers/media/pci/sta2x11/sta2x11_vip.c
> @@ -847,7 +847,7 @@ static int sta2x11_vip_init_buffer(struct sta2x11_vip *vip)
> }
> memset(&vip->vb_vidq, 0, sizeof(struct vb2_queue));
> vip->vb_vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - vip->vb_vidq.io_modes = VB2_MMAP | VB2_READ;
> + vip->vb_vidq.io_modes = VB2_MMAP | VB2_READ | VB2_DMABUF;
> vip->vb_vidq.drv_priv = vip;
> vip->vb_vidq.buf_struct_size = sizeof(struct vip_buffer);
> vip->vb_vidq.ops = &vip_video_qops;
> diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c
> index d2cbcdca0463..55bae20eb8db 100644
> --- a/drivers/media/platform/exynos4-is/fimc-isp-video.c
> +++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c
> @@ -587,7 +587,7 @@ int fimc_isp_video_device_register(struct fimc_isp *isp,
>
> memset(q, 0, sizeof(*q));
> q->type = type;
> - q->io_modes = VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->ops = &isp_video_capture_qops;
> q->mem_ops = &vb2_dma_contig_memops;
> q->buf_struct_size = sizeof(struct isp_video_buf);
> diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
> index e87c6a09205b..d06bf4865b84 100644
> --- a/drivers/media/platform/exynos4-is/fimc-lite.c
> +++ b/drivers/media/platform/exynos4-is/fimc-lite.c
> @@ -1276,7 +1276,7 @@ static int fimc_lite_subdev_registered(struct v4l2_subdev *sd)
>
> memset(q, 0, sizeof(*q));
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
> - q->io_modes = VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->ops = &fimc_lite_qops;
> q->mem_ops = &vb2_dma_contig_memops;
> q->buf_struct_size = sizeof(struct flite_buffer);
> diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
> index ee183c35ff3b..e8c46ff1aeb4 100644
> --- a/drivers/media/platform/omap3isp/ispvideo.c
> +++ b/drivers/media/platform/omap3isp/ispvideo.c
> @@ -1319,7 +1319,7 @@ static int isp_video_open(struct file *file)
>
> queue = &handle->queue;
> queue->type = video->type;
> - queue->io_modes = VB2_MMAP | VB2_USERPTR;
> + queue->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> queue->drv_priv = handle;
> queue->ops = &isp_video_queue_ops;
> queue->mem_ops = &vb2_dma_contig_memops;
> diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c
> index 2fb45db8e4ba..54989dacaf5d 100644
> --- a/drivers/media/platform/s3c-camif/camif-capture.c
> +++ b/drivers/media/platform/s3c-camif/camif-capture.c
> @@ -1121,7 +1121,7 @@ int s3c_camif_register_video_node(struct camif_dev *camif, int idx)
>
> memset(q, 0, sizeof(*q));
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - q->io_modes = VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->ops = &s3c_camif_qops;
> q->mem_ops = &vb2_dma_contig_memops;
> q->buf_struct_size = sizeof(struct camif_buffer);
> diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c
> index f5f05ea9f521..98f94e1fa6b8 100644
> --- a/drivers/media/platform/s5p-g2d/g2d.c
> +++ b/drivers/media/platform/s5p-g2d/g2d.c
> @@ -144,7 +144,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
> int ret;
>
> src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
> - src_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + src_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> src_vq->drv_priv = ctx;
> src_vq->ops = &g2d_qops;
> src_vq->mem_ops = &vb2_dma_contig_memops;
> @@ -158,7 +158,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
> return ret;
>
> dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - dst_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + dst_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> dst_vq->drv_priv = ctx;
> dst_vq->ops = &g2d_qops;
> dst_vq->mem_ops = &vb2_dma_contig_memops;
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> index ac2162235cef..4c10ec0d7da4 100644
> --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
> +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> @@ -2620,7 +2620,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
> int ret;
>
> src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
> - src_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + src_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> src_vq->drv_priv = ctx;
> src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
> src_vq->ops = &s5p_jpeg_qops;
> @@ -2634,7 +2634,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
> return ret;
>
> dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - dst_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + dst_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> dst_vq->drv_priv = ctx;
> dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
> dst_vq->ops = &s5p_jpeg_qops;
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> index b776f83e395e..ff770328f690 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> @@ -845,10 +845,10 @@ static int s5p_mfc_open(struct file *file)
> q->drv_priv = &ctx->fh;
> q->lock = &dev->mfc_mutex;
> if (vdev == dev->vfd_dec) {
> - q->io_modes = VB2_MMAP;
> + q->io_modes = VB2_MMAP | VB2_DMABUF;
> q->ops = get_dec_queue_ops();
> } else if (vdev == dev->vfd_enc) {
> - q->io_modes = VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->ops = get_enc_queue_ops();
> } else {
> ret = -ENOENT;
> @@ -872,10 +872,10 @@ static int s5p_mfc_open(struct file *file)
> q->drv_priv = &ctx->fh;
> q->lock = &dev->mfc_mutex;
> if (vdev == dev->vfd_dec) {
> - q->io_modes = VB2_MMAP;
> + q->io_modes = VB2_MMAP | VB2_DMABUF;
> q->ops = get_dec_queue_ops();
> } else if (vdev == dev->vfd_enc) {
> - q->io_modes = VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->ops = get_enc_queue_ops();
> } else {
> ret = -ENOENT;
> diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c
> index 2b4c0d9d6928..b95a7e2ede55 100644
> --- a/drivers/media/platform/sh_veu.c
> +++ b/drivers/media/platform/sh_veu.c
> @@ -924,7 +924,7 @@ static int sh_veu_queue_init(void *priv, struct vb2_queue *src_vq,
>
> memset(src_vq, 0, sizeof(*src_vq));
> src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
> - src_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + src_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> src_vq->drv_priv = veu;
> src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
> src_vq->ops = &sh_veu_qops;
> @@ -939,7 +939,7 @@ static int sh_veu_queue_init(void *priv, struct vb2_queue *src_vq,
>
> memset(dst_vq, 0, sizeof(*dst_vq));
> dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - dst_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + dst_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> dst_vq->drv_priv = veu;
> dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
> dst_vq->ops = &sh_veu_qops;
> diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
> index 78fa1c535ac6..3278746246aa 100644
> --- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
> +++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
> @@ -413,7 +413,7 @@ int sun4i_csi_dma_register(struct sun4i_csi *csi, int irq)
>
> q->min_buffers_needed = 3;
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
> - q->io_modes = VB2_MMAP;
> + q->io_modes = VB2_MMAP | VB2_DMABUF;
> q->lock = &csi->lock;
> q->drv_priv = csi;
> q->buf_struct_size = sizeof(struct sun4i_csi_buffer);
> diff --git a/drivers/media/usb/airspy/airspy.c b/drivers/media/usb/airspy/airspy.c
> index 751703db06f5..e6ac289d7aa0 100644
> --- a/drivers/media/usb/airspy/airspy.c
> +++ b/drivers/media/usb/airspy/airspy.c
> @@ -999,7 +999,7 @@ static int airspy_probe(struct usb_interface *intf,
>
> /* Init videobuf2 queue structure */
> s->vb_queue.type = V4L2_BUF_TYPE_SDR_CAPTURE;
> - s->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + s->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> s->vb_queue.drv_priv = s;
> s->vb_queue.buf_struct_size = sizeof(struct airspy_frame_buf);
> s->vb_queue.ops = &airspy_vb2_ops;
> diff --git a/drivers/media/usb/dvb-usb/cxusb-analog.c b/drivers/media/usb/dvb-usb/cxusb-analog.c
> index 0699f718d052..574094e0cb7d 100644
> --- a/drivers/media/usb/dvb-usb/cxusb-analog.c
> +++ b/drivers/media/usb/dvb-usb/cxusb-analog.c
> @@ -1626,8 +1626,8 @@ static int cxusb_medion_register_analog_video(struct dvb_usb_device *dvbdev)
> int ret;
>
> cxdev->videoqueue.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - cxdev->videoqueue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ |
> - VB2_DMABUF;
> + cxdev->videoqueue.io_modes =
> + VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> cxdev->videoqueue.ops = &cxdev_video_qops;
> cxdev->videoqueue.mem_ops = &vb2_vmalloc_memops;
> cxdev->videoqueue.drv_priv = dvbdev;
> diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
> index b0f7390e4b4f..fead98e5cfc3 100644
> --- a/drivers/media/usb/em28xx/em28xx-video.c
> +++ b/drivers/media/usb/em28xx/em28xx-video.c
> @@ -1266,7 +1266,7 @@ static int em28xx_vb2_setup(struct em28xx *dev)
> /* Setup Videobuf2 for VBI capture */
> q = &v4l2->vb_vbiq;
> q->type = V4L2_BUF_TYPE_VBI_CAPTURE;
> - q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
> q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
> q->drv_priv = dev;
> q->buf_struct_size = sizeof(struct em28xx_buffer);
> diff --git a/drivers/media/usb/go7007/go7007-v4l2.c b/drivers/media/usb/go7007/go7007-v4l2.c
> index 0b3d185f3cb0..da7f7a27da62 100644
> --- a/drivers/media/usb/go7007/go7007-v4l2.c
> +++ b/drivers/media/usb/go7007/go7007-v4l2.c
> @@ -1081,7 +1081,7 @@ int go7007_v4l2_init(struct go7007 *go)
>
> INIT_LIST_HEAD(&go->vidq_active);
> go->vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - go->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + go->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> go->vidq.ops = &go7007_video_qops;
> go->vidq.mem_ops = &vb2_vmalloc_memops;
> go->vidq.drv_priv = go;
> diff --git a/drivers/media/usb/msi2500/msi2500.c b/drivers/media/usb/msi2500/msi2500.c
> index 65be6f140fe8..29f888d449ff 100644
> --- a/drivers/media/usb/msi2500/msi2500.c
> +++ b/drivers/media/usb/msi2500/msi2500.c
> @@ -1196,7 +1196,7 @@ static int msi2500_probe(struct usb_interface *intf,
>
> /* Init videobuf2 queue structure */
> dev->vb_queue.type = V4L2_BUF_TYPE_SDR_CAPTURE;
> - dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> dev->vb_queue.drv_priv = dev;
> dev->vb_queue.buf_struct_size = sizeof(struct msi2500_frame_buf);
> dev->vb_queue.ops = &msi2500_vb2_ops;
> diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
> index 9b76cf133d52..0a033a5781d5 100644
> --- a/drivers/media/usb/pwc/pwc-if.c
> +++ b/drivers/media/usb/pwc/pwc-if.c
> @@ -1044,7 +1044,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
>
> /* Init videobuf2 queue structure */
> pdev->vb_queue.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - pdev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + pdev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> pdev->vb_queue.drv_priv = pdev;
> pdev->vb_queue.buf_struct_size = sizeof(struct pwc_frame_buf);
> pdev->vb_queue.ops = &pwc_vb_queue_ops;
> diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
> index 329ec8089592..d4d7555f9c36 100644
> --- a/drivers/media/usb/s2255/s2255drv.c
> +++ b/drivers/media/usb/s2255/s2255drv.c
> @@ -1625,7 +1625,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
> }
> q = &vc->vb_vidq;
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - q->io_modes = VB2_MMAP | VB2_READ | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_READ | VB2_USERPTR | VB2_DMABUF;
> q->drv_priv = vc;
> q->lock = &vc->vb_lock;
> q->buf_struct_size = sizeof(struct s2255_buffer);
> diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c
> index 3d9284a09ee5..c0d77e0fc86f 100644
> --- a/drivers/media/usb/usbtv/usbtv-video.c
> +++ b/drivers/media/usb/usbtv/usbtv-video.c
> @@ -888,7 +888,7 @@ int usbtv_video_init(struct usbtv *usbtv)
>
> /* videobuf2 structure */
> usbtv->vb2q.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - usbtv->vb2q.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + usbtv->vb2q.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> usbtv->vb2q.drv_priv = usbtv;
> usbtv->vb2q.buf_struct_size = sizeof(struct usbtv_buf);
> usbtv->vb2q.ops = &usbtv_vb2_ops;
> diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
> index cd60c6c1749e..a1cc5788da56 100644
> --- a/drivers/media/usb/uvc/uvc_queue.c
> +++ b/drivers/media/usb/uvc/uvc_queue.c
> @@ -222,7 +222,7 @@ int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
> int ret;
>
> queue->queue.type = type;
> - queue->queue.io_modes = VB2_MMAP | VB2_USERPTR;
> + queue->queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
> queue->queue.drv_priv = queue;
> queue->queue.buf_struct_size = sizeof(struct uvc_buffer);
> queue->queue.mem_ops = &vb2_vmalloc_memops;
> diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> index 1ef31a984741..fe7a8205bfd4 100644
> --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> @@ -1919,7 +1919,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev)
> q = &dev->capture.vb_vidq;
> memset(q, 0, sizeof(*q));
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> q->drv_priv = dev;
> q->buf_struct_size = sizeof(struct mmal_buffer);
> q->ops = &bm2835_mmal_video_qops;
> --
> 2.25.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] media: v4l2: add VB2_DMABUF to all drivers
2020-02-21 8:26 [PATCH] media: v4l2: add VB2_DMABUF to all drivers Hans Verkuil
2020-02-21 8:40 ` Tomasz Figa
@ 2020-02-21 10:36 ` Dave Stevenson
2020-02-21 13:09 ` Laurent Pinchart
2 siblings, 0 replies; 5+ messages in thread
From: Dave Stevenson @ 2020-02-21 10:36 UTC (permalink / raw)
To: Hans Verkuil
Cc: Linux Media Mailing List, Tomasz Figa, Sylwester Nawrocki,
Laurent Pinchart, Maxime Ripard, Dave Stevenson
Hi Hans
On Fri, 21 Feb 2020 at 08:26, Hans Verkuil <hverkuil@xs4all.nl> wrote:
>
> There where still several (usually old) vb2-based drivers that did not
> support DMABUF as streaming mode. There is no reason not to support this,
> so add it throughout the media tree.
>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
For bcm2835-camera:
Acked-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
> ---
> drivers/media/dvb-frontends/rtl2832_sdr.c | 2 +-
> drivers/media/pci/saa7134/saa7134-video.c | 2 +-
> drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +-
> drivers/media/pci/solo6x10/solo6x10-v4l2.c | 2 +-
> drivers/media/pci/sta2x11/sta2x11_vip.c | 2 +-
> drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +-
> drivers/media/platform/exynos4-is/fimc-lite.c | 2 +-
> drivers/media/platform/omap3isp/ispvideo.c | 2 +-
> drivers/media/platform/s3c-camif/camif-capture.c | 2 +-
> drivers/media/platform/s5p-g2d/g2d.c | 4 ++--
> drivers/media/platform/s5p-jpeg/jpeg-core.c | 4 ++--
> drivers/media/platform/s5p-mfc/s5p_mfc.c | 8 ++++----
> drivers/media/platform/sh_veu.c | 4 ++--
> drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 2 +-
> drivers/media/usb/airspy/airspy.c | 2 +-
> drivers/media/usb/dvb-usb/cxusb-analog.c | 4 ++--
> drivers/media/usb/em28xx/em28xx-video.c | 2 +-
> drivers/media/usb/go7007/go7007-v4l2.c | 2 +-
> drivers/media/usb/msi2500/msi2500.c | 2 +-
> drivers/media/usb/pwc/pwc-if.c | 2 +-
> drivers/media/usb/s2255/s2255drv.c | 2 +-
> drivers/media/usb/usbtv/usbtv-video.c | 2 +-
> drivers/media/usb/uvc/uvc_queue.c | 2 +-
> .../staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 2 +-
> 24 files changed, 31 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c
> index 60d1e59d2292..55ac4b32ea39 100644
> --- a/drivers/media/dvb-frontends/rtl2832_sdr.c
> +++ b/drivers/media/dvb-frontends/rtl2832_sdr.c
> @@ -1359,7 +1359,7 @@ static int rtl2832_sdr_probe(struct platform_device *pdev)
>
> /* Init videobuf2 queue structure */
> dev->vb_queue.type = V4L2_BUF_TYPE_SDR_CAPTURE;
> - dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> dev->vb_queue.drv_priv = dev;
> dev->vb_queue.buf_struct_size = sizeof(struct rtl2832_sdr_frame_buf);
> dev->vb_queue.ops = &rtl2832_sdr_vb2_ops;
> diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
> index 342cabf48064..2d3081dbdf83 100644
> --- a/drivers/media/pci/saa7134/saa7134-video.c
> +++ b/drivers/media/pci/saa7134/saa7134-video.c
> @@ -2133,7 +2133,7 @@ int saa7134_video_init1(struct saa7134_dev *dev)
> q = &dev->vbi_vbq;
> q->type = V4L2_BUF_TYPE_VBI_CAPTURE;
> /* Don't add VB2_USERPTR, see comment above */
> - q->io_modes = VB2_MMAP | VB2_READ;
> + q->io_modes = VB2_MMAP | VB2_READ | VB2_DMABUF;
> if (saa7134_userptr)
> q->io_modes |= VB2_USERPTR;
> q->drv_priv = &dev->vbi_q;
> diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
> index 476d7f3b32d6..d3239d86cead 100644
> --- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
> +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
> @@ -1265,7 +1265,7 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo_dev *solo_dev,
> solo_enc->motion_global = true;
> solo_enc->motion_thresh = SOLO_DEF_MOT_THRESH;
> solo_enc->vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - solo_enc->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + solo_enc->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> solo_enc->vidq.ops = &solo_enc_video_qops;
> solo_enc->vidq.mem_ops = &vb2_dma_sg_memops;
> solo_enc->vidq.drv_priv = solo_enc;
> diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2.c b/drivers/media/pci/solo6x10/solo6x10-v4l2.c
> index 78792067e920..9d290099b7a0 100644
> --- a/drivers/media/pci/solo6x10/solo6x10-v4l2.c
> +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2.c
> @@ -667,7 +667,7 @@ int solo_v4l2_init(struct solo_dev *solo_dev, unsigned nr)
> video_set_drvdata(solo_dev->vfd, solo_dev);
>
> solo_dev->vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - solo_dev->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + solo_dev->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> solo_dev->vidq.ops = &solo_video_qops;
> solo_dev->vidq.mem_ops = &vb2_dma_contig_memops;
> solo_dev->vidq.drv_priv = solo_dev;
> diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c
> index fd3de3bb0c89..b97c13472cb3 100644
> --- a/drivers/media/pci/sta2x11/sta2x11_vip.c
> +++ b/drivers/media/pci/sta2x11/sta2x11_vip.c
> @@ -847,7 +847,7 @@ static int sta2x11_vip_init_buffer(struct sta2x11_vip *vip)
> }
> memset(&vip->vb_vidq, 0, sizeof(struct vb2_queue));
> vip->vb_vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - vip->vb_vidq.io_modes = VB2_MMAP | VB2_READ;
> + vip->vb_vidq.io_modes = VB2_MMAP | VB2_READ | VB2_DMABUF;
> vip->vb_vidq.drv_priv = vip;
> vip->vb_vidq.buf_struct_size = sizeof(struct vip_buffer);
> vip->vb_vidq.ops = &vip_video_qops;
> diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c
> index d2cbcdca0463..55bae20eb8db 100644
> --- a/drivers/media/platform/exynos4-is/fimc-isp-video.c
> +++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c
> @@ -587,7 +587,7 @@ int fimc_isp_video_device_register(struct fimc_isp *isp,
>
> memset(q, 0, sizeof(*q));
> q->type = type;
> - q->io_modes = VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->ops = &isp_video_capture_qops;
> q->mem_ops = &vb2_dma_contig_memops;
> q->buf_struct_size = sizeof(struct isp_video_buf);
> diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
> index e87c6a09205b..d06bf4865b84 100644
> --- a/drivers/media/platform/exynos4-is/fimc-lite.c
> +++ b/drivers/media/platform/exynos4-is/fimc-lite.c
> @@ -1276,7 +1276,7 @@ static int fimc_lite_subdev_registered(struct v4l2_subdev *sd)
>
> memset(q, 0, sizeof(*q));
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
> - q->io_modes = VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->ops = &fimc_lite_qops;
> q->mem_ops = &vb2_dma_contig_memops;
> q->buf_struct_size = sizeof(struct flite_buffer);
> diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
> index ee183c35ff3b..e8c46ff1aeb4 100644
> --- a/drivers/media/platform/omap3isp/ispvideo.c
> +++ b/drivers/media/platform/omap3isp/ispvideo.c
> @@ -1319,7 +1319,7 @@ static int isp_video_open(struct file *file)
>
> queue = &handle->queue;
> queue->type = video->type;
> - queue->io_modes = VB2_MMAP | VB2_USERPTR;
> + queue->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> queue->drv_priv = handle;
> queue->ops = &isp_video_queue_ops;
> queue->mem_ops = &vb2_dma_contig_memops;
> diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c
> index 2fb45db8e4ba..54989dacaf5d 100644
> --- a/drivers/media/platform/s3c-camif/camif-capture.c
> +++ b/drivers/media/platform/s3c-camif/camif-capture.c
> @@ -1121,7 +1121,7 @@ int s3c_camif_register_video_node(struct camif_dev *camif, int idx)
>
> memset(q, 0, sizeof(*q));
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - q->io_modes = VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->ops = &s3c_camif_qops;
> q->mem_ops = &vb2_dma_contig_memops;
> q->buf_struct_size = sizeof(struct camif_buffer);
> diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c
> index f5f05ea9f521..98f94e1fa6b8 100644
> --- a/drivers/media/platform/s5p-g2d/g2d.c
> +++ b/drivers/media/platform/s5p-g2d/g2d.c
> @@ -144,7 +144,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
> int ret;
>
> src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
> - src_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + src_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> src_vq->drv_priv = ctx;
> src_vq->ops = &g2d_qops;
> src_vq->mem_ops = &vb2_dma_contig_memops;
> @@ -158,7 +158,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
> return ret;
>
> dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - dst_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + dst_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> dst_vq->drv_priv = ctx;
> dst_vq->ops = &g2d_qops;
> dst_vq->mem_ops = &vb2_dma_contig_memops;
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> index ac2162235cef..4c10ec0d7da4 100644
> --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
> +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> @@ -2620,7 +2620,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
> int ret;
>
> src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
> - src_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + src_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> src_vq->drv_priv = ctx;
> src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
> src_vq->ops = &s5p_jpeg_qops;
> @@ -2634,7 +2634,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
> return ret;
>
> dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - dst_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + dst_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> dst_vq->drv_priv = ctx;
> dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
> dst_vq->ops = &s5p_jpeg_qops;
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> index b776f83e395e..ff770328f690 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> @@ -845,10 +845,10 @@ static int s5p_mfc_open(struct file *file)
> q->drv_priv = &ctx->fh;
> q->lock = &dev->mfc_mutex;
> if (vdev == dev->vfd_dec) {
> - q->io_modes = VB2_MMAP;
> + q->io_modes = VB2_MMAP | VB2_DMABUF;
> q->ops = get_dec_queue_ops();
> } else if (vdev == dev->vfd_enc) {
> - q->io_modes = VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->ops = get_enc_queue_ops();
> } else {
> ret = -ENOENT;
> @@ -872,10 +872,10 @@ static int s5p_mfc_open(struct file *file)
> q->drv_priv = &ctx->fh;
> q->lock = &dev->mfc_mutex;
> if (vdev == dev->vfd_dec) {
> - q->io_modes = VB2_MMAP;
> + q->io_modes = VB2_MMAP | VB2_DMABUF;
> q->ops = get_dec_queue_ops();
> } else if (vdev == dev->vfd_enc) {
> - q->io_modes = VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->ops = get_enc_queue_ops();
> } else {
> ret = -ENOENT;
> diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c
> index 2b4c0d9d6928..b95a7e2ede55 100644
> --- a/drivers/media/platform/sh_veu.c
> +++ b/drivers/media/platform/sh_veu.c
> @@ -924,7 +924,7 @@ static int sh_veu_queue_init(void *priv, struct vb2_queue *src_vq,
>
> memset(src_vq, 0, sizeof(*src_vq));
> src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
> - src_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + src_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> src_vq->drv_priv = veu;
> src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
> src_vq->ops = &sh_veu_qops;
> @@ -939,7 +939,7 @@ static int sh_veu_queue_init(void *priv, struct vb2_queue *src_vq,
>
> memset(dst_vq, 0, sizeof(*dst_vq));
> dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - dst_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + dst_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> dst_vq->drv_priv = veu;
> dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
> dst_vq->ops = &sh_veu_qops;
> diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
> index 78fa1c535ac6..3278746246aa 100644
> --- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
> +++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
> @@ -413,7 +413,7 @@ int sun4i_csi_dma_register(struct sun4i_csi *csi, int irq)
>
> q->min_buffers_needed = 3;
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
> - q->io_modes = VB2_MMAP;
> + q->io_modes = VB2_MMAP | VB2_DMABUF;
> q->lock = &csi->lock;
> q->drv_priv = csi;
> q->buf_struct_size = sizeof(struct sun4i_csi_buffer);
> diff --git a/drivers/media/usb/airspy/airspy.c b/drivers/media/usb/airspy/airspy.c
> index 751703db06f5..e6ac289d7aa0 100644
> --- a/drivers/media/usb/airspy/airspy.c
> +++ b/drivers/media/usb/airspy/airspy.c
> @@ -999,7 +999,7 @@ static int airspy_probe(struct usb_interface *intf,
>
> /* Init videobuf2 queue structure */
> s->vb_queue.type = V4L2_BUF_TYPE_SDR_CAPTURE;
> - s->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + s->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> s->vb_queue.drv_priv = s;
> s->vb_queue.buf_struct_size = sizeof(struct airspy_frame_buf);
> s->vb_queue.ops = &airspy_vb2_ops;
> diff --git a/drivers/media/usb/dvb-usb/cxusb-analog.c b/drivers/media/usb/dvb-usb/cxusb-analog.c
> index 0699f718d052..574094e0cb7d 100644
> --- a/drivers/media/usb/dvb-usb/cxusb-analog.c
> +++ b/drivers/media/usb/dvb-usb/cxusb-analog.c
> @@ -1626,8 +1626,8 @@ static int cxusb_medion_register_analog_video(struct dvb_usb_device *dvbdev)
> int ret;
>
> cxdev->videoqueue.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - cxdev->videoqueue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ |
> - VB2_DMABUF;
> + cxdev->videoqueue.io_modes =
> + VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> cxdev->videoqueue.ops = &cxdev_video_qops;
> cxdev->videoqueue.mem_ops = &vb2_vmalloc_memops;
> cxdev->videoqueue.drv_priv = dvbdev;
> diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
> index b0f7390e4b4f..fead98e5cfc3 100644
> --- a/drivers/media/usb/em28xx/em28xx-video.c
> +++ b/drivers/media/usb/em28xx/em28xx-video.c
> @@ -1266,7 +1266,7 @@ static int em28xx_vb2_setup(struct em28xx *dev)
> /* Setup Videobuf2 for VBI capture */
> q = &v4l2->vb_vbiq;
> q->type = V4L2_BUF_TYPE_VBI_CAPTURE;
> - q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
> q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
> q->drv_priv = dev;
> q->buf_struct_size = sizeof(struct em28xx_buffer);
> diff --git a/drivers/media/usb/go7007/go7007-v4l2.c b/drivers/media/usb/go7007/go7007-v4l2.c
> index 0b3d185f3cb0..da7f7a27da62 100644
> --- a/drivers/media/usb/go7007/go7007-v4l2.c
> +++ b/drivers/media/usb/go7007/go7007-v4l2.c
> @@ -1081,7 +1081,7 @@ int go7007_v4l2_init(struct go7007 *go)
>
> INIT_LIST_HEAD(&go->vidq_active);
> go->vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - go->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + go->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> go->vidq.ops = &go7007_video_qops;
> go->vidq.mem_ops = &vb2_vmalloc_memops;
> go->vidq.drv_priv = go;
> diff --git a/drivers/media/usb/msi2500/msi2500.c b/drivers/media/usb/msi2500/msi2500.c
> index 65be6f140fe8..29f888d449ff 100644
> --- a/drivers/media/usb/msi2500/msi2500.c
> +++ b/drivers/media/usb/msi2500/msi2500.c
> @@ -1196,7 +1196,7 @@ static int msi2500_probe(struct usb_interface *intf,
>
> /* Init videobuf2 queue structure */
> dev->vb_queue.type = V4L2_BUF_TYPE_SDR_CAPTURE;
> - dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> dev->vb_queue.drv_priv = dev;
> dev->vb_queue.buf_struct_size = sizeof(struct msi2500_frame_buf);
> dev->vb_queue.ops = &msi2500_vb2_ops;
> diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
> index 9b76cf133d52..0a033a5781d5 100644
> --- a/drivers/media/usb/pwc/pwc-if.c
> +++ b/drivers/media/usb/pwc/pwc-if.c
> @@ -1044,7 +1044,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
>
> /* Init videobuf2 queue structure */
> pdev->vb_queue.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - pdev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + pdev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> pdev->vb_queue.drv_priv = pdev;
> pdev->vb_queue.buf_struct_size = sizeof(struct pwc_frame_buf);
> pdev->vb_queue.ops = &pwc_vb_queue_ops;
> diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
> index 329ec8089592..d4d7555f9c36 100644
> --- a/drivers/media/usb/s2255/s2255drv.c
> +++ b/drivers/media/usb/s2255/s2255drv.c
> @@ -1625,7 +1625,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
> }
> q = &vc->vb_vidq;
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - q->io_modes = VB2_MMAP | VB2_READ | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_READ | VB2_USERPTR | VB2_DMABUF;
> q->drv_priv = vc;
> q->lock = &vc->vb_lock;
> q->buf_struct_size = sizeof(struct s2255_buffer);
> diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c
> index 3d9284a09ee5..c0d77e0fc86f 100644
> --- a/drivers/media/usb/usbtv/usbtv-video.c
> +++ b/drivers/media/usb/usbtv/usbtv-video.c
> @@ -888,7 +888,7 @@ int usbtv_video_init(struct usbtv *usbtv)
>
> /* videobuf2 structure */
> usbtv->vb2q.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - usbtv->vb2q.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + usbtv->vb2q.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> usbtv->vb2q.drv_priv = usbtv;
> usbtv->vb2q.buf_struct_size = sizeof(struct usbtv_buf);
> usbtv->vb2q.ops = &usbtv_vb2_ops;
> diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
> index cd60c6c1749e..a1cc5788da56 100644
> --- a/drivers/media/usb/uvc/uvc_queue.c
> +++ b/drivers/media/usb/uvc/uvc_queue.c
> @@ -222,7 +222,7 @@ int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
> int ret;
>
> queue->queue.type = type;
> - queue->queue.io_modes = VB2_MMAP | VB2_USERPTR;
> + queue->queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
> queue->queue.drv_priv = queue;
> queue->queue.buf_struct_size = sizeof(struct uvc_buffer);
> queue->queue.mem_ops = &vb2_vmalloc_memops;
> diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> index 1ef31a984741..fe7a8205bfd4 100644
> --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> @@ -1919,7 +1919,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev)
> q = &dev->capture.vb_vidq;
> memset(q, 0, sizeof(*q));
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> q->drv_priv = dev;
> q->buf_struct_size = sizeof(struct mmal_buffer);
> q->ops = &bm2835_mmal_video_qops;
> --
> 2.25.0
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] media: v4l2: add VB2_DMABUF to all drivers
2020-02-21 8:26 [PATCH] media: v4l2: add VB2_DMABUF to all drivers Hans Verkuil
2020-02-21 8:40 ` Tomasz Figa
2020-02-21 10:36 ` Dave Stevenson
@ 2020-02-21 13:09 ` Laurent Pinchart
2020-02-21 13:40 ` Hans Verkuil
2 siblings, 1 reply; 5+ messages in thread
From: Laurent Pinchart @ 2020-02-21 13:09 UTC (permalink / raw)
To: Hans Verkuil
Cc: Linux Media Mailing List, Tomasz Figa, Sylwester Nawrocki,
Maxime Ripard, Dave Stevenson
Hi Hans,
Thank you for the patch.
On Fri, Feb 21, 2020 at 09:26:32AM +0100, Hans Verkuil wrote:
> There where still several (usually old) vb2-based drivers that did not
> support DMABUF as streaming mode. There is no reason not to support this,
> so add it throughout the media tree.
>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
If we want to enable DMABUF support unconditionally (or nearly, se
Tomasz' reply), wouldn't it make more sense to drop the VB2_DMABUF flag
from drivers and set it in vb2 ? We could add a VB2_NO_DMABUF for the
odd cases. We could do the same for VB2_MMAP. It would make driver code
simpler.
> ---
> drivers/media/dvb-frontends/rtl2832_sdr.c | 2 +-
> drivers/media/pci/saa7134/saa7134-video.c | 2 +-
> drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +-
> drivers/media/pci/solo6x10/solo6x10-v4l2.c | 2 +-
> drivers/media/pci/sta2x11/sta2x11_vip.c | 2 +-
> drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +-
> drivers/media/platform/exynos4-is/fimc-lite.c | 2 +-
> drivers/media/platform/omap3isp/ispvideo.c | 2 +-
> drivers/media/platform/s3c-camif/camif-capture.c | 2 +-
> drivers/media/platform/s5p-g2d/g2d.c | 4 ++--
> drivers/media/platform/s5p-jpeg/jpeg-core.c | 4 ++--
> drivers/media/platform/s5p-mfc/s5p_mfc.c | 8 ++++----
> drivers/media/platform/sh_veu.c | 4 ++--
> drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 2 +-
> drivers/media/usb/airspy/airspy.c | 2 +-
> drivers/media/usb/dvb-usb/cxusb-analog.c | 4 ++--
> drivers/media/usb/em28xx/em28xx-video.c | 2 +-
> drivers/media/usb/go7007/go7007-v4l2.c | 2 +-
> drivers/media/usb/msi2500/msi2500.c | 2 +-
> drivers/media/usb/pwc/pwc-if.c | 2 +-
> drivers/media/usb/s2255/s2255drv.c | 2 +-
> drivers/media/usb/usbtv/usbtv-video.c | 2 +-
> drivers/media/usb/uvc/uvc_queue.c | 2 +-
> .../staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 2 +-
> 24 files changed, 31 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c
> index 60d1e59d2292..55ac4b32ea39 100644
> --- a/drivers/media/dvb-frontends/rtl2832_sdr.c
> +++ b/drivers/media/dvb-frontends/rtl2832_sdr.c
> @@ -1359,7 +1359,7 @@ static int rtl2832_sdr_probe(struct platform_device *pdev)
>
> /* Init videobuf2 queue structure */
> dev->vb_queue.type = V4L2_BUF_TYPE_SDR_CAPTURE;
> - dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> dev->vb_queue.drv_priv = dev;
> dev->vb_queue.buf_struct_size = sizeof(struct rtl2832_sdr_frame_buf);
> dev->vb_queue.ops = &rtl2832_sdr_vb2_ops;
> diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
> index 342cabf48064..2d3081dbdf83 100644
> --- a/drivers/media/pci/saa7134/saa7134-video.c
> +++ b/drivers/media/pci/saa7134/saa7134-video.c
> @@ -2133,7 +2133,7 @@ int saa7134_video_init1(struct saa7134_dev *dev)
> q = &dev->vbi_vbq;
> q->type = V4L2_BUF_TYPE_VBI_CAPTURE;
> /* Don't add VB2_USERPTR, see comment above */
> - q->io_modes = VB2_MMAP | VB2_READ;
> + q->io_modes = VB2_MMAP | VB2_READ | VB2_DMABUF;
> if (saa7134_userptr)
> q->io_modes |= VB2_USERPTR;
> q->drv_priv = &dev->vbi_q;
> diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
> index 476d7f3b32d6..d3239d86cead 100644
> --- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
> +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
> @@ -1265,7 +1265,7 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo_dev *solo_dev,
> solo_enc->motion_global = true;
> solo_enc->motion_thresh = SOLO_DEF_MOT_THRESH;
> solo_enc->vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - solo_enc->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + solo_enc->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> solo_enc->vidq.ops = &solo_enc_video_qops;
> solo_enc->vidq.mem_ops = &vb2_dma_sg_memops;
> solo_enc->vidq.drv_priv = solo_enc;
> diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2.c b/drivers/media/pci/solo6x10/solo6x10-v4l2.c
> index 78792067e920..9d290099b7a0 100644
> --- a/drivers/media/pci/solo6x10/solo6x10-v4l2.c
> +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2.c
> @@ -667,7 +667,7 @@ int solo_v4l2_init(struct solo_dev *solo_dev, unsigned nr)
> video_set_drvdata(solo_dev->vfd, solo_dev);
>
> solo_dev->vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - solo_dev->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + solo_dev->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> solo_dev->vidq.ops = &solo_video_qops;
> solo_dev->vidq.mem_ops = &vb2_dma_contig_memops;
> solo_dev->vidq.drv_priv = solo_dev;
> diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c
> index fd3de3bb0c89..b97c13472cb3 100644
> --- a/drivers/media/pci/sta2x11/sta2x11_vip.c
> +++ b/drivers/media/pci/sta2x11/sta2x11_vip.c
> @@ -847,7 +847,7 @@ static int sta2x11_vip_init_buffer(struct sta2x11_vip *vip)
> }
> memset(&vip->vb_vidq, 0, sizeof(struct vb2_queue));
> vip->vb_vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - vip->vb_vidq.io_modes = VB2_MMAP | VB2_READ;
> + vip->vb_vidq.io_modes = VB2_MMAP | VB2_READ | VB2_DMABUF;
> vip->vb_vidq.drv_priv = vip;
> vip->vb_vidq.buf_struct_size = sizeof(struct vip_buffer);
> vip->vb_vidq.ops = &vip_video_qops;
> diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c
> index d2cbcdca0463..55bae20eb8db 100644
> --- a/drivers/media/platform/exynos4-is/fimc-isp-video.c
> +++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c
> @@ -587,7 +587,7 @@ int fimc_isp_video_device_register(struct fimc_isp *isp,
>
> memset(q, 0, sizeof(*q));
> q->type = type;
> - q->io_modes = VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->ops = &isp_video_capture_qops;
> q->mem_ops = &vb2_dma_contig_memops;
> q->buf_struct_size = sizeof(struct isp_video_buf);
> diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
> index e87c6a09205b..d06bf4865b84 100644
> --- a/drivers/media/platform/exynos4-is/fimc-lite.c
> +++ b/drivers/media/platform/exynos4-is/fimc-lite.c
> @@ -1276,7 +1276,7 @@ static int fimc_lite_subdev_registered(struct v4l2_subdev *sd)
>
> memset(q, 0, sizeof(*q));
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
> - q->io_modes = VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->ops = &fimc_lite_qops;
> q->mem_ops = &vb2_dma_contig_memops;
> q->buf_struct_size = sizeof(struct flite_buffer);
> diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
> index ee183c35ff3b..e8c46ff1aeb4 100644
> --- a/drivers/media/platform/omap3isp/ispvideo.c
> +++ b/drivers/media/platform/omap3isp/ispvideo.c
> @@ -1319,7 +1319,7 @@ static int isp_video_open(struct file *file)
>
> queue = &handle->queue;
> queue->type = video->type;
> - queue->io_modes = VB2_MMAP | VB2_USERPTR;
> + queue->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> queue->drv_priv = handle;
> queue->ops = &isp_video_queue_ops;
> queue->mem_ops = &vb2_dma_contig_memops;
> diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c
> index 2fb45db8e4ba..54989dacaf5d 100644
> --- a/drivers/media/platform/s3c-camif/camif-capture.c
> +++ b/drivers/media/platform/s3c-camif/camif-capture.c
> @@ -1121,7 +1121,7 @@ int s3c_camif_register_video_node(struct camif_dev *camif, int idx)
>
> memset(q, 0, sizeof(*q));
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - q->io_modes = VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->ops = &s3c_camif_qops;
> q->mem_ops = &vb2_dma_contig_memops;
> q->buf_struct_size = sizeof(struct camif_buffer);
> diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c
> index f5f05ea9f521..98f94e1fa6b8 100644
> --- a/drivers/media/platform/s5p-g2d/g2d.c
> +++ b/drivers/media/platform/s5p-g2d/g2d.c
> @@ -144,7 +144,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
> int ret;
>
> src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
> - src_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + src_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> src_vq->drv_priv = ctx;
> src_vq->ops = &g2d_qops;
> src_vq->mem_ops = &vb2_dma_contig_memops;
> @@ -158,7 +158,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
> return ret;
>
> dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - dst_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + dst_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> dst_vq->drv_priv = ctx;
> dst_vq->ops = &g2d_qops;
> dst_vq->mem_ops = &vb2_dma_contig_memops;
> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> index ac2162235cef..4c10ec0d7da4 100644
> --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
> +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
> @@ -2620,7 +2620,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
> int ret;
>
> src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
> - src_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + src_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> src_vq->drv_priv = ctx;
> src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
> src_vq->ops = &s5p_jpeg_qops;
> @@ -2634,7 +2634,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
> return ret;
>
> dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - dst_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + dst_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> dst_vq->drv_priv = ctx;
> dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
> dst_vq->ops = &s5p_jpeg_qops;
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> index b776f83e395e..ff770328f690 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> @@ -845,10 +845,10 @@ static int s5p_mfc_open(struct file *file)
> q->drv_priv = &ctx->fh;
> q->lock = &dev->mfc_mutex;
> if (vdev == dev->vfd_dec) {
> - q->io_modes = VB2_MMAP;
> + q->io_modes = VB2_MMAP | VB2_DMABUF;
> q->ops = get_dec_queue_ops();
> } else if (vdev == dev->vfd_enc) {
> - q->io_modes = VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->ops = get_enc_queue_ops();
> } else {
> ret = -ENOENT;
> @@ -872,10 +872,10 @@ static int s5p_mfc_open(struct file *file)
> q->drv_priv = &ctx->fh;
> q->lock = &dev->mfc_mutex;
> if (vdev == dev->vfd_dec) {
> - q->io_modes = VB2_MMAP;
> + q->io_modes = VB2_MMAP | VB2_DMABUF;
> q->ops = get_dec_queue_ops();
> } else if (vdev == dev->vfd_enc) {
> - q->io_modes = VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> q->ops = get_enc_queue_ops();
> } else {
> ret = -ENOENT;
> diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c
> index 2b4c0d9d6928..b95a7e2ede55 100644
> --- a/drivers/media/platform/sh_veu.c
> +++ b/drivers/media/platform/sh_veu.c
> @@ -924,7 +924,7 @@ static int sh_veu_queue_init(void *priv, struct vb2_queue *src_vq,
>
> memset(src_vq, 0, sizeof(*src_vq));
> src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
> - src_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + src_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> src_vq->drv_priv = veu;
> src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
> src_vq->ops = &sh_veu_qops;
> @@ -939,7 +939,7 @@ static int sh_veu_queue_init(void *priv, struct vb2_queue *src_vq,
>
> memset(dst_vq, 0, sizeof(*dst_vq));
> dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - dst_vq->io_modes = VB2_MMAP | VB2_USERPTR;
> + dst_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
> dst_vq->drv_priv = veu;
> dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
> dst_vq->ops = &sh_veu_qops;
> diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
> index 78fa1c535ac6..3278746246aa 100644
> --- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
> +++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
> @@ -413,7 +413,7 @@ int sun4i_csi_dma_register(struct sun4i_csi *csi, int irq)
>
> q->min_buffers_needed = 3;
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
> - q->io_modes = VB2_MMAP;
> + q->io_modes = VB2_MMAP | VB2_DMABUF;
> q->lock = &csi->lock;
> q->drv_priv = csi;
> q->buf_struct_size = sizeof(struct sun4i_csi_buffer);
> diff --git a/drivers/media/usb/airspy/airspy.c b/drivers/media/usb/airspy/airspy.c
> index 751703db06f5..e6ac289d7aa0 100644
> --- a/drivers/media/usb/airspy/airspy.c
> +++ b/drivers/media/usb/airspy/airspy.c
> @@ -999,7 +999,7 @@ static int airspy_probe(struct usb_interface *intf,
>
> /* Init videobuf2 queue structure */
> s->vb_queue.type = V4L2_BUF_TYPE_SDR_CAPTURE;
> - s->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + s->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> s->vb_queue.drv_priv = s;
> s->vb_queue.buf_struct_size = sizeof(struct airspy_frame_buf);
> s->vb_queue.ops = &airspy_vb2_ops;
> diff --git a/drivers/media/usb/dvb-usb/cxusb-analog.c b/drivers/media/usb/dvb-usb/cxusb-analog.c
> index 0699f718d052..574094e0cb7d 100644
> --- a/drivers/media/usb/dvb-usb/cxusb-analog.c
> +++ b/drivers/media/usb/dvb-usb/cxusb-analog.c
> @@ -1626,8 +1626,8 @@ static int cxusb_medion_register_analog_video(struct dvb_usb_device *dvbdev)
> int ret;
>
> cxdev->videoqueue.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - cxdev->videoqueue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ |
> - VB2_DMABUF;
> + cxdev->videoqueue.io_modes =
> + VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> cxdev->videoqueue.ops = &cxdev_video_qops;
> cxdev->videoqueue.mem_ops = &vb2_vmalloc_memops;
> cxdev->videoqueue.drv_priv = dvbdev;
> diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
> index b0f7390e4b4f..fead98e5cfc3 100644
> --- a/drivers/media/usb/em28xx/em28xx-video.c
> +++ b/drivers/media/usb/em28xx/em28xx-video.c
> @@ -1266,7 +1266,7 @@ static int em28xx_vb2_setup(struct em28xx *dev)
> /* Setup Videobuf2 for VBI capture */
> q = &v4l2->vb_vbiq;
> q->type = V4L2_BUF_TYPE_VBI_CAPTURE;
> - q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR;
> + q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
> q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
> q->drv_priv = dev;
> q->buf_struct_size = sizeof(struct em28xx_buffer);
> diff --git a/drivers/media/usb/go7007/go7007-v4l2.c b/drivers/media/usb/go7007/go7007-v4l2.c
> index 0b3d185f3cb0..da7f7a27da62 100644
> --- a/drivers/media/usb/go7007/go7007-v4l2.c
> +++ b/drivers/media/usb/go7007/go7007-v4l2.c
> @@ -1081,7 +1081,7 @@ int go7007_v4l2_init(struct go7007 *go)
>
> INIT_LIST_HEAD(&go->vidq_active);
> go->vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - go->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + go->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> go->vidq.ops = &go7007_video_qops;
> go->vidq.mem_ops = &vb2_vmalloc_memops;
> go->vidq.drv_priv = go;
> diff --git a/drivers/media/usb/msi2500/msi2500.c b/drivers/media/usb/msi2500/msi2500.c
> index 65be6f140fe8..29f888d449ff 100644
> --- a/drivers/media/usb/msi2500/msi2500.c
> +++ b/drivers/media/usb/msi2500/msi2500.c
> @@ -1196,7 +1196,7 @@ static int msi2500_probe(struct usb_interface *intf,
>
> /* Init videobuf2 queue structure */
> dev->vb_queue.type = V4L2_BUF_TYPE_SDR_CAPTURE;
> - dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> dev->vb_queue.drv_priv = dev;
> dev->vb_queue.buf_struct_size = sizeof(struct msi2500_frame_buf);
> dev->vb_queue.ops = &msi2500_vb2_ops;
> diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
> index 9b76cf133d52..0a033a5781d5 100644
> --- a/drivers/media/usb/pwc/pwc-if.c
> +++ b/drivers/media/usb/pwc/pwc-if.c
> @@ -1044,7 +1044,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
>
> /* Init videobuf2 queue structure */
> pdev->vb_queue.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - pdev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + pdev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> pdev->vb_queue.drv_priv = pdev;
> pdev->vb_queue.buf_struct_size = sizeof(struct pwc_frame_buf);
> pdev->vb_queue.ops = &pwc_vb_queue_ops;
> diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
> index 329ec8089592..d4d7555f9c36 100644
> --- a/drivers/media/usb/s2255/s2255drv.c
> +++ b/drivers/media/usb/s2255/s2255drv.c
> @@ -1625,7 +1625,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
> }
> q = &vc->vb_vidq;
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - q->io_modes = VB2_MMAP | VB2_READ | VB2_USERPTR;
> + q->io_modes = VB2_MMAP | VB2_READ | VB2_USERPTR | VB2_DMABUF;
> q->drv_priv = vc;
> q->lock = &vc->vb_lock;
> q->buf_struct_size = sizeof(struct s2255_buffer);
> diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c
> index 3d9284a09ee5..c0d77e0fc86f 100644
> --- a/drivers/media/usb/usbtv/usbtv-video.c
> +++ b/drivers/media/usb/usbtv/usbtv-video.c
> @@ -888,7 +888,7 @@ int usbtv_video_init(struct usbtv *usbtv)
>
> /* videobuf2 structure */
> usbtv->vb2q.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - usbtv->vb2q.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + usbtv->vb2q.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> usbtv->vb2q.drv_priv = usbtv;
> usbtv->vb2q.buf_struct_size = sizeof(struct usbtv_buf);
> usbtv->vb2q.ops = &usbtv_vb2_ops;
> diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
> index cd60c6c1749e..a1cc5788da56 100644
> --- a/drivers/media/usb/uvc/uvc_queue.c
> +++ b/drivers/media/usb/uvc/uvc_queue.c
> @@ -222,7 +222,7 @@ int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
> int ret;
>
> queue->queue.type = type;
> - queue->queue.io_modes = VB2_MMAP | VB2_USERPTR;
> + queue->queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
> queue->queue.drv_priv = queue;
> queue->queue.buf_struct_size = sizeof(struct uvc_buffer);
> queue->queue.mem_ops = &vb2_vmalloc_memops;
> diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> index 1ef31a984741..fe7a8205bfd4 100644
> --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> @@ -1919,7 +1919,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev)
> q = &dev->capture.vb_vidq;
> memset(q, 0, sizeof(*q));
> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
> - q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
> + q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
> q->drv_priv = dev;
> q->buf_struct_size = sizeof(struct mmal_buffer);
> q->ops = &bm2835_mmal_video_qops;
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] media: v4l2: add VB2_DMABUF to all drivers
2020-02-21 13:09 ` Laurent Pinchart
@ 2020-02-21 13:40 ` Hans Verkuil
0 siblings, 0 replies; 5+ messages in thread
From: Hans Verkuil @ 2020-02-21 13:40 UTC (permalink / raw)
To: Laurent Pinchart
Cc: Linux Media Mailing List, Tomasz Figa, Sylwester Nawrocki,
Maxime Ripard, Dave Stevenson
On 2/21/20 2:09 PM, Laurent Pinchart wrote:
> Hi Hans,
>
> Thank you for the patch.
>
> On Fri, Feb 21, 2020 at 09:26:32AM +0100, Hans Verkuil wrote:
>> There where still several (usually old) vb2-based drivers that did not
>> support DMABUF as streaming mode. There is no reason not to support this,
>> so add it throughout the media tree.
>>
>> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
>
> If we want to enable DMABUF support unconditionally (or nearly, se
> Tomasz' reply), wouldn't it make more sense to drop the VB2_DMABUF flag
> from drivers and set it in vb2 ? We could add a VB2_NO_DMABUF for the
> odd cases. We could do the same for VB2_MMAP. It would make driver code
> simpler.
That was my follow-up plan. Note that dvb devices that use vb2 can't make
use of DMABUF AFAIK.
Regards,
Hans
>
>> ---
>> drivers/media/dvb-frontends/rtl2832_sdr.c | 2 +-
>> drivers/media/pci/saa7134/saa7134-video.c | 2 +-
>> drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +-
>> drivers/media/pci/solo6x10/solo6x10-v4l2.c | 2 +-
>> drivers/media/pci/sta2x11/sta2x11_vip.c | 2 +-
>> drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +-
>> drivers/media/platform/exynos4-is/fimc-lite.c | 2 +-
>> drivers/media/platform/omap3isp/ispvideo.c | 2 +-
>> drivers/media/platform/s3c-camif/camif-capture.c | 2 +-
>> drivers/media/platform/s5p-g2d/g2d.c | 4 ++--
>> drivers/media/platform/s5p-jpeg/jpeg-core.c | 4 ++--
>> drivers/media/platform/s5p-mfc/s5p_mfc.c | 8 ++++----
>> drivers/media/platform/sh_veu.c | 4 ++--
>> drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 2 +-
>> drivers/media/usb/airspy/airspy.c | 2 +-
>> drivers/media/usb/dvb-usb/cxusb-analog.c | 4 ++--
>> drivers/media/usb/em28xx/em28xx-video.c | 2 +-
>> drivers/media/usb/go7007/go7007-v4l2.c | 2 +-
>> drivers/media/usb/msi2500/msi2500.c | 2 +-
>> drivers/media/usb/pwc/pwc-if.c | 2 +-
>> drivers/media/usb/s2255/s2255drv.c | 2 +-
>> drivers/media/usb/usbtv/usbtv-video.c | 2 +-
>> drivers/media/usb/uvc/uvc_queue.c | 2 +-
>> .../staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 2 +-
>> 24 files changed, 31 insertions(+), 31 deletions(-)
>>
>> diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c
>> index 60d1e59d2292..55ac4b32ea39 100644
>> --- a/drivers/media/dvb-frontends/rtl2832_sdr.c
>> +++ b/drivers/media/dvb-frontends/rtl2832_sdr.c
>> @@ -1359,7 +1359,7 @@ static int rtl2832_sdr_probe(struct platform_device *pdev)
>>
>> /* Init videobuf2 queue structure */
>> dev->vb_queue.type = V4L2_BUF_TYPE_SDR_CAPTURE;
>> - dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
>> + dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
>> dev->vb_queue.drv_priv = dev;
>> dev->vb_queue.buf_struct_size = sizeof(struct rtl2832_sdr_frame_buf);
>> dev->vb_queue.ops = &rtl2832_sdr_vb2_ops;
>> diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
>> index 342cabf48064..2d3081dbdf83 100644
>> --- a/drivers/media/pci/saa7134/saa7134-video.c
>> +++ b/drivers/media/pci/saa7134/saa7134-video.c
>> @@ -2133,7 +2133,7 @@ int saa7134_video_init1(struct saa7134_dev *dev)
>> q = &dev->vbi_vbq;
>> q->type = V4L2_BUF_TYPE_VBI_CAPTURE;
>> /* Don't add VB2_USERPTR, see comment above */
>> - q->io_modes = VB2_MMAP | VB2_READ;
>> + q->io_modes = VB2_MMAP | VB2_READ | VB2_DMABUF;
>> if (saa7134_userptr)
>> q->io_modes |= VB2_USERPTR;
>> q->drv_priv = &dev->vbi_q;
>> diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
>> index 476d7f3b32d6..d3239d86cead 100644
>> --- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
>> +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
>> @@ -1265,7 +1265,7 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo_dev *solo_dev,
>> solo_enc->motion_global = true;
>> solo_enc->motion_thresh = SOLO_DEF_MOT_THRESH;
>> solo_enc->vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>> - solo_enc->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
>> + solo_enc->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
>> solo_enc->vidq.ops = &solo_enc_video_qops;
>> solo_enc->vidq.mem_ops = &vb2_dma_sg_memops;
>> solo_enc->vidq.drv_priv = solo_enc;
>> diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2.c b/drivers/media/pci/solo6x10/solo6x10-v4l2.c
>> index 78792067e920..9d290099b7a0 100644
>> --- a/drivers/media/pci/solo6x10/solo6x10-v4l2.c
>> +++ b/drivers/media/pci/solo6x10/solo6x10-v4l2.c
>> @@ -667,7 +667,7 @@ int solo_v4l2_init(struct solo_dev *solo_dev, unsigned nr)
>> video_set_drvdata(solo_dev->vfd, solo_dev);
>>
>> solo_dev->vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>> - solo_dev->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
>> + solo_dev->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
>> solo_dev->vidq.ops = &solo_video_qops;
>> solo_dev->vidq.mem_ops = &vb2_dma_contig_memops;
>> solo_dev->vidq.drv_priv = solo_dev;
>> diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c
>> index fd3de3bb0c89..b97c13472cb3 100644
>> --- a/drivers/media/pci/sta2x11/sta2x11_vip.c
>> +++ b/drivers/media/pci/sta2x11/sta2x11_vip.c
>> @@ -847,7 +847,7 @@ static int sta2x11_vip_init_buffer(struct sta2x11_vip *vip)
>> }
>> memset(&vip->vb_vidq, 0, sizeof(struct vb2_queue));
>> vip->vb_vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>> - vip->vb_vidq.io_modes = VB2_MMAP | VB2_READ;
>> + vip->vb_vidq.io_modes = VB2_MMAP | VB2_READ | VB2_DMABUF;
>> vip->vb_vidq.drv_priv = vip;
>> vip->vb_vidq.buf_struct_size = sizeof(struct vip_buffer);
>> vip->vb_vidq.ops = &vip_video_qops;
>> diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c
>> index d2cbcdca0463..55bae20eb8db 100644
>> --- a/drivers/media/platform/exynos4-is/fimc-isp-video.c
>> +++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c
>> @@ -587,7 +587,7 @@ int fimc_isp_video_device_register(struct fimc_isp *isp,
>>
>> memset(q, 0, sizeof(*q));
>> q->type = type;
>> - q->io_modes = VB2_MMAP | VB2_USERPTR;
>> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
>> q->ops = &isp_video_capture_qops;
>> q->mem_ops = &vb2_dma_contig_memops;
>> q->buf_struct_size = sizeof(struct isp_video_buf);
>> diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
>> index e87c6a09205b..d06bf4865b84 100644
>> --- a/drivers/media/platform/exynos4-is/fimc-lite.c
>> +++ b/drivers/media/platform/exynos4-is/fimc-lite.c
>> @@ -1276,7 +1276,7 @@ static int fimc_lite_subdev_registered(struct v4l2_subdev *sd)
>>
>> memset(q, 0, sizeof(*q));
>> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
>> - q->io_modes = VB2_MMAP | VB2_USERPTR;
>> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
>> q->ops = &fimc_lite_qops;
>> q->mem_ops = &vb2_dma_contig_memops;
>> q->buf_struct_size = sizeof(struct flite_buffer);
>> diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
>> index ee183c35ff3b..e8c46ff1aeb4 100644
>> --- a/drivers/media/platform/omap3isp/ispvideo.c
>> +++ b/drivers/media/platform/omap3isp/ispvideo.c
>> @@ -1319,7 +1319,7 @@ static int isp_video_open(struct file *file)
>>
>> queue = &handle->queue;
>> queue->type = video->type;
>> - queue->io_modes = VB2_MMAP | VB2_USERPTR;
>> + queue->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
>> queue->drv_priv = handle;
>> queue->ops = &isp_video_queue_ops;
>> queue->mem_ops = &vb2_dma_contig_memops;
>> diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c
>> index 2fb45db8e4ba..54989dacaf5d 100644
>> --- a/drivers/media/platform/s3c-camif/camif-capture.c
>> +++ b/drivers/media/platform/s3c-camif/camif-capture.c
>> @@ -1121,7 +1121,7 @@ int s3c_camif_register_video_node(struct camif_dev *camif, int idx)
>>
>> memset(q, 0, sizeof(*q));
>> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>> - q->io_modes = VB2_MMAP | VB2_USERPTR;
>> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
>> q->ops = &s3c_camif_qops;
>> q->mem_ops = &vb2_dma_contig_memops;
>> q->buf_struct_size = sizeof(struct camif_buffer);
>> diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c
>> index f5f05ea9f521..98f94e1fa6b8 100644
>> --- a/drivers/media/platform/s5p-g2d/g2d.c
>> +++ b/drivers/media/platform/s5p-g2d/g2d.c
>> @@ -144,7 +144,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
>> int ret;
>>
>> src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
>> - src_vq->io_modes = VB2_MMAP | VB2_USERPTR;
>> + src_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
>> src_vq->drv_priv = ctx;
>> src_vq->ops = &g2d_qops;
>> src_vq->mem_ops = &vb2_dma_contig_memops;
>> @@ -158,7 +158,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
>> return ret;
>>
>> dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>> - dst_vq->io_modes = VB2_MMAP | VB2_USERPTR;
>> + dst_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
>> dst_vq->drv_priv = ctx;
>> dst_vq->ops = &g2d_qops;
>> dst_vq->mem_ops = &vb2_dma_contig_memops;
>> diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
>> index ac2162235cef..4c10ec0d7da4 100644
>> --- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
>> +++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
>> @@ -2620,7 +2620,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
>> int ret;
>>
>> src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
>> - src_vq->io_modes = VB2_MMAP | VB2_USERPTR;
>> + src_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
>> src_vq->drv_priv = ctx;
>> src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
>> src_vq->ops = &s5p_jpeg_qops;
>> @@ -2634,7 +2634,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
>> return ret;
>>
>> dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>> - dst_vq->io_modes = VB2_MMAP | VB2_USERPTR;
>> + dst_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
>> dst_vq->drv_priv = ctx;
>> dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
>> dst_vq->ops = &s5p_jpeg_qops;
>> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
>> index b776f83e395e..ff770328f690 100644
>> --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
>> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
>> @@ -845,10 +845,10 @@ static int s5p_mfc_open(struct file *file)
>> q->drv_priv = &ctx->fh;
>> q->lock = &dev->mfc_mutex;
>> if (vdev == dev->vfd_dec) {
>> - q->io_modes = VB2_MMAP;
>> + q->io_modes = VB2_MMAP | VB2_DMABUF;
>> q->ops = get_dec_queue_ops();
>> } else if (vdev == dev->vfd_enc) {
>> - q->io_modes = VB2_MMAP | VB2_USERPTR;
>> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
>> q->ops = get_enc_queue_ops();
>> } else {
>> ret = -ENOENT;
>> @@ -872,10 +872,10 @@ static int s5p_mfc_open(struct file *file)
>> q->drv_priv = &ctx->fh;
>> q->lock = &dev->mfc_mutex;
>> if (vdev == dev->vfd_dec) {
>> - q->io_modes = VB2_MMAP;
>> + q->io_modes = VB2_MMAP | VB2_DMABUF;
>> q->ops = get_dec_queue_ops();
>> } else if (vdev == dev->vfd_enc) {
>> - q->io_modes = VB2_MMAP | VB2_USERPTR;
>> + q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
>> q->ops = get_enc_queue_ops();
>> } else {
>> ret = -ENOENT;
>> diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c
>> index 2b4c0d9d6928..b95a7e2ede55 100644
>> --- a/drivers/media/platform/sh_veu.c
>> +++ b/drivers/media/platform/sh_veu.c
>> @@ -924,7 +924,7 @@ static int sh_veu_queue_init(void *priv, struct vb2_queue *src_vq,
>>
>> memset(src_vq, 0, sizeof(*src_vq));
>> src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
>> - src_vq->io_modes = VB2_MMAP | VB2_USERPTR;
>> + src_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
>> src_vq->drv_priv = veu;
>> src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
>> src_vq->ops = &sh_veu_qops;
>> @@ -939,7 +939,7 @@ static int sh_veu_queue_init(void *priv, struct vb2_queue *src_vq,
>>
>> memset(dst_vq, 0, sizeof(*dst_vq));
>> dst_vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>> - dst_vq->io_modes = VB2_MMAP | VB2_USERPTR;
>> + dst_vq->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR;
>> dst_vq->drv_priv = veu;
>> dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
>> dst_vq->ops = &sh_veu_qops;
>> diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
>> index 78fa1c535ac6..3278746246aa 100644
>> --- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
>> +++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c
>> @@ -413,7 +413,7 @@ int sun4i_csi_dma_register(struct sun4i_csi *csi, int irq)
>>
>> q->min_buffers_needed = 3;
>> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
>> - q->io_modes = VB2_MMAP;
>> + q->io_modes = VB2_MMAP | VB2_DMABUF;
>> q->lock = &csi->lock;
>> q->drv_priv = csi;
>> q->buf_struct_size = sizeof(struct sun4i_csi_buffer);
>> diff --git a/drivers/media/usb/airspy/airspy.c b/drivers/media/usb/airspy/airspy.c
>> index 751703db06f5..e6ac289d7aa0 100644
>> --- a/drivers/media/usb/airspy/airspy.c
>> +++ b/drivers/media/usb/airspy/airspy.c
>> @@ -999,7 +999,7 @@ static int airspy_probe(struct usb_interface *intf,
>>
>> /* Init videobuf2 queue structure */
>> s->vb_queue.type = V4L2_BUF_TYPE_SDR_CAPTURE;
>> - s->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
>> + s->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
>> s->vb_queue.drv_priv = s;
>> s->vb_queue.buf_struct_size = sizeof(struct airspy_frame_buf);
>> s->vb_queue.ops = &airspy_vb2_ops;
>> diff --git a/drivers/media/usb/dvb-usb/cxusb-analog.c b/drivers/media/usb/dvb-usb/cxusb-analog.c
>> index 0699f718d052..574094e0cb7d 100644
>> --- a/drivers/media/usb/dvb-usb/cxusb-analog.c
>> +++ b/drivers/media/usb/dvb-usb/cxusb-analog.c
>> @@ -1626,8 +1626,8 @@ static int cxusb_medion_register_analog_video(struct dvb_usb_device *dvbdev)
>> int ret;
>>
>> cxdev->videoqueue.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>> - cxdev->videoqueue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ |
>> - VB2_DMABUF;
>> + cxdev->videoqueue.io_modes =
>> + VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
>> cxdev->videoqueue.ops = &cxdev_video_qops;
>> cxdev->videoqueue.mem_ops = &vb2_vmalloc_memops;
>> cxdev->videoqueue.drv_priv = dvbdev;
>> diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
>> index b0f7390e4b4f..fead98e5cfc3 100644
>> --- a/drivers/media/usb/em28xx/em28xx-video.c
>> +++ b/drivers/media/usb/em28xx/em28xx-video.c
>> @@ -1266,7 +1266,7 @@ static int em28xx_vb2_setup(struct em28xx *dev)
>> /* Setup Videobuf2 for VBI capture */
>> q = &v4l2->vb_vbiq;
>> q->type = V4L2_BUF_TYPE_VBI_CAPTURE;
>> - q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR;
>> + q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
>> q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
>> q->drv_priv = dev;
>> q->buf_struct_size = sizeof(struct em28xx_buffer);
>> diff --git a/drivers/media/usb/go7007/go7007-v4l2.c b/drivers/media/usb/go7007/go7007-v4l2.c
>> index 0b3d185f3cb0..da7f7a27da62 100644
>> --- a/drivers/media/usb/go7007/go7007-v4l2.c
>> +++ b/drivers/media/usb/go7007/go7007-v4l2.c
>> @@ -1081,7 +1081,7 @@ int go7007_v4l2_init(struct go7007 *go)
>>
>> INIT_LIST_HEAD(&go->vidq_active);
>> go->vidq.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>> - go->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
>> + go->vidq.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
>> go->vidq.ops = &go7007_video_qops;
>> go->vidq.mem_ops = &vb2_vmalloc_memops;
>> go->vidq.drv_priv = go;
>> diff --git a/drivers/media/usb/msi2500/msi2500.c b/drivers/media/usb/msi2500/msi2500.c
>> index 65be6f140fe8..29f888d449ff 100644
>> --- a/drivers/media/usb/msi2500/msi2500.c
>> +++ b/drivers/media/usb/msi2500/msi2500.c
>> @@ -1196,7 +1196,7 @@ static int msi2500_probe(struct usb_interface *intf,
>>
>> /* Init videobuf2 queue structure */
>> dev->vb_queue.type = V4L2_BUF_TYPE_SDR_CAPTURE;
>> - dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
>> + dev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
>> dev->vb_queue.drv_priv = dev;
>> dev->vb_queue.buf_struct_size = sizeof(struct msi2500_frame_buf);
>> dev->vb_queue.ops = &msi2500_vb2_ops;
>> diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
>> index 9b76cf133d52..0a033a5781d5 100644
>> --- a/drivers/media/usb/pwc/pwc-if.c
>> +++ b/drivers/media/usb/pwc/pwc-if.c
>> @@ -1044,7 +1044,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
>>
>> /* Init videobuf2 queue structure */
>> pdev->vb_queue.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>> - pdev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
>> + pdev->vb_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
>> pdev->vb_queue.drv_priv = pdev;
>> pdev->vb_queue.buf_struct_size = sizeof(struct pwc_frame_buf);
>> pdev->vb_queue.ops = &pwc_vb_queue_ops;
>> diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
>> index 329ec8089592..d4d7555f9c36 100644
>> --- a/drivers/media/usb/s2255/s2255drv.c
>> +++ b/drivers/media/usb/s2255/s2255drv.c
>> @@ -1625,7 +1625,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
>> }
>> q = &vc->vb_vidq;
>> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>> - q->io_modes = VB2_MMAP | VB2_READ | VB2_USERPTR;
>> + q->io_modes = VB2_MMAP | VB2_READ | VB2_USERPTR | VB2_DMABUF;
>> q->drv_priv = vc;
>> q->lock = &vc->vb_lock;
>> q->buf_struct_size = sizeof(struct s2255_buffer);
>> diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c
>> index 3d9284a09ee5..c0d77e0fc86f 100644
>> --- a/drivers/media/usb/usbtv/usbtv-video.c
>> +++ b/drivers/media/usb/usbtv/usbtv-video.c
>> @@ -888,7 +888,7 @@ int usbtv_video_init(struct usbtv *usbtv)
>>
>> /* videobuf2 structure */
>> usbtv->vb2q.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>> - usbtv->vb2q.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
>> + usbtv->vb2q.io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
>> usbtv->vb2q.drv_priv = usbtv;
>> usbtv->vb2q.buf_struct_size = sizeof(struct usbtv_buf);
>> usbtv->vb2q.ops = &usbtv_vb2_ops;
>> diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
>> index cd60c6c1749e..a1cc5788da56 100644
>> --- a/drivers/media/usb/uvc/uvc_queue.c
>> +++ b/drivers/media/usb/uvc/uvc_queue.c
>> @@ -222,7 +222,7 @@ int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
>> int ret;
>>
>> queue->queue.type = type;
>> - queue->queue.io_modes = VB2_MMAP | VB2_USERPTR;
>> + queue->queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
>> queue->queue.drv_priv = queue;
>> queue->queue.buf_struct_size = sizeof(struct uvc_buffer);
>> queue->queue.mem_ops = &vb2_vmalloc_memops;
>> diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
>> index 1ef31a984741..fe7a8205bfd4 100644
>> --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
>> +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
>> @@ -1919,7 +1919,7 @@ static int bcm2835_mmal_probe(struct platform_device *pdev)
>> q = &dev->capture.vb_vidq;
>> memset(q, 0, sizeof(*q));
>> q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
>> - q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ;
>> + q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_READ | VB2_DMABUF;
>> q->drv_priv = dev;
>> q->buf_struct_size = sizeof(struct mmal_buffer);
>> q->ops = &bm2835_mmal_video_qops;
>
^ permalink raw reply [flat|nested] 5+ messages in thread