The combination of VB2_USERPTR and dma-contig makes no sense for these devices, drop it. Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx> Cc: Lad Prabhakar <prabhakar.csengg@xxxxxxxxx> --- drivers/media/platform/davinci/vpbe_display.c | 2 +- drivers/media/platform/davinci/vpif_capture.c | 2 +- drivers/media/platform/davinci/vpif_display.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c index ae419958e420..2641973998fe 100644 --- a/drivers/media/platform/davinci/vpbe_display.c +++ b/drivers/media/platform/davinci/vpbe_display.c @@ -1426,7 +1426,7 @@ static int vpbe_display_probe(struct platform_device *pdev) q = &disp_dev->dev[i]->buffer_queue; memset(q, 0, sizeof(*q)); q->type = V4L2_BUF_TYPE_VIDEO_OUTPUT; - q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF; + q->io_modes = VB2_MMAP | VB2_DMABUF; q->drv_priv = disp_dev->dev[i]; q->ops = &video_qops; q->mem_ops = &vb2_dma_contig_memops; diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c index 71f4fe882d13..9c8b05f7fc29 100644 --- a/drivers/media/platform/davinci/vpif_capture.c +++ b/drivers/media/platform/davinci/vpif_capture.c @@ -1435,7 +1435,7 @@ static int vpif_probe_complete(void) /* Initialize vb2 queue */ q = &common->buffer_queue; q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF; + q->io_modes = VB2_MMAP | VB2_DMABUF; q->drv_priv = ch; q->ops = &video_qops; q->mem_ops = &vb2_dma_contig_memops; diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c index abbdbac08e6f..ee6f1fd2baac 100644 --- a/drivers/media/platform/davinci/vpif_display.c +++ b/drivers/media/platform/davinci/vpif_display.c @@ -1181,7 +1181,7 @@ static int vpif_probe_complete(void) /* Initialize vb2 queue */ q = &common->buffer_queue; q->type = V4L2_BUF_TYPE_VIDEO_OUTPUT; - q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF; + q->io_modes = VB2_MMAP | VB2_DMABUF; q->drv_priv = ch; q->ops = &video_qops; q->mem_ops = &vb2_dma_contig_memops; -- 2.25.0
