Commit 5f028c51 authored Feb 20, 2020 by Dafna Hirschfeld Committed by Mauro Carvalho Chehab Mar 02, 2020

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 <dafna.hirschfeld@collabora.com>
Acked-by: Helen Koike <helen.koike@collabora.com>
[hverkuil-cisco@xs4all.nl: replaced commit log with Helen's suggestion]
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent 1583c793

drivers/staging/media/rkisp1/rkisp1-capture.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;