From 5f028c51a771b348fac65ef39989d0498bb76729 Mon Sep 17 00:00:00 2001 From: Dafna Hirschfeld Date: Thu, 20 Feb 2020 19:56:03 +0100 Subject: [PATCH] media: staging: rkisp1: capture: remove support to userptr memory VB2_USERPTR support doesn't make sense for drivers based on vb2_dma_contig, so just drop it. Otherwise, queues using vb2_dma_contig_memops causes v4l2-compliance to fail for VB2_USERPTR mode, due to buffer misalignment. Signed-off-by: Dafna Hirschfeld Acked-by: Helen Koike [hverkuil-cisco@xs4all.nl: replaced commit log with Helen's suggestion] Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/rkisp1/rkisp1-capture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c index 026470c7b43d..24fe6a7888aa 100644 --- a/drivers/staging/media/rkisp1/rkisp1-capture.c +++ b/drivers/staging/media/rkisp1/rkisp1-capture.c @@ -1341,7 +1341,7 @@ static int rkisp1_register_capture(struct rkisp1_capture *cap) q = &node->buf_queue; q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; - q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR; + q->io_modes = VB2_MMAP | VB2_DMABUF; q->drv_priv = cap; q->ops = &rkisp1_vb2_ops; q->mem_ops = &vb2_dma_contig_memops; -- 2.11.0