Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Dafna Hirschfeld and committed by
Mauro Carvalho Chehab
5f028c51 1583c793

+1 -1
+1 -1
drivers/staging/media/rkisp1/rkisp1-capture.c
··· 1341 1341 1342 1342 q = &node->buf_queue; 1343 1343 q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; 1344 - q->io_modes = VB2_MMAP | VB2_DMABUF | VB2_USERPTR; 1344 + q->io_modes = VB2_MMAP | VB2_DMABUF; 1345 1345 q->drv_priv = cap; 1346 1346 q->ops = &rkisp1_vb2_ops; 1347 1347 q->mem_ops = &vb2_dma_contig_memops;