diff options
| author | Dafna Hirschfeld <dafna.hirschfeld@collabora.com> | 2020-02-20 19:56:03 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-03-02 15:31:51 +0100 |
| commit | 5f028c51a771b348fac65ef39989d0498bb76729 (patch) | |
| tree | 85afe3320a0377bcddb1201b24a954d7dd965ffd | |
| parent | 1583c793af736c8d33bf4aa6054ddc5c86e5a6c7 (diff) | |
| download | linux-0-day-5f028c51a771b348fac65ef39989d0498bb76729.tar.gz linux-0-day-5f028c51a771b348fac65ef39989d0498bb76729.tar.xz | |
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>
| -rw-r--r-- | drivers/staging/media/rkisp1/rkisp1-capture.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/media/rkisp1/rkisp1-capture.c b/drivers/staging/media/rkisp1/rkisp1-capture.c index 026470c7b43dc..24fe6a7888aa4 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; |