]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
[media] v4l: xilinx: VIDEO_XILINX should depend on HAS_DMA
authorGeert Uytterhoeven <geert@linux-m68k.org>
Thu, 23 Apr 2015 18:09:05 +0000 (15:09 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Fri, 1 May 2015 10:10:09 +0000 (07:10 -0300)
If NO_DMA=y:

    warning: (VIDEO_XILINX && VIDEO_DM365_VPFE && VIDEO_DT3155 && VIDEO_OMAP4) selects VIDEOBUF2_DMA_CONTIG which has unmet direct dependencies (MEDIA_SUPPORT && HAS_DMA)

    media/v4l2-core/videobuf2-dma-contig.c: In function ‘vb2_dc_mmap’:
    media/v4l2-core/videobuf2-dma-contig.c:207: error: implicit declaration of function ‘dma_mmap_coherent’
    media/v4l2-core/videobuf2-dma-contig.c: In function ‘vb2_dc_get_base_sgt’:
    media/v4l2-core/videobuf2-dma-contig.c:390: error: implicit declaration of function ‘dma_get_sgtable’

VIDEO_XILINX selects VIDEOBUF2_DMA_CONTIG, which bypasses its dependency
on HAS_DMA.  Make VIDEO_XILINX depend on HAS_DMA to fix this.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/platform/xilinx/Kconfig

index d7324c726fc2a881d5af572b918cf814832d03de..84bae795b70d3148beb0e5f90c12ad88dffe3bb6 100644 (file)
@@ -1,6 +1,6 @@
 config VIDEO_XILINX
        tristate "Xilinx Video IP (EXPERIMENTAL)"
-       depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && OF
+       depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && OF && HAS_DMA
        select VIDEOBUF2_DMA_CONTIG
        ---help---
          Driver for Xilinx Video IP Pipelines