Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12bd88e6 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] be sure that HAS_DMA is enabled for vb2-dma-contig 



vb2-dma-contig depends on HAS_DMA, but the Kbuild doesn't take
it into account at select.

Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 7155043c

drivers/media/pci/solo6x10/Kconfig

+1 −0
Original line number Diff line number Diff line 
config VIDEO_SOLO6X10

	tristate "Bluecherry / Softlogic 6x10 capture cards (MPEG-4/H.264)"

	depends on PCI && VIDEO_DEV && SND && I2C

	depends on HAS_DMA

	select BITREVERSE

	select FONT_SUPPORT

	select FONT_8x16

drivers/media/pci/sta2x11/Kconfig

+1 −0
Original line number Diff line number Diff line 
config STA2X11_VIP

	tristate "STA2X11 VIP Video For Linux"

	depends on STA2X11

	depends on HAS_DMA

	select VIDEO_ADV7180 if MEDIA_SUBDRV_AUTOSELECT

	select VIDEOBUF2_DMA_CONTIG

	depends on PCI && VIDEO_V4L2 && VIRT_TO_BUS

drivers/media/platform/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ config VIDEO_M32R_AR_M64278 
config VIDEO_OMAP3

	tristate "OMAP 3 Camera support"

	depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3

	depends on HAS_DMA

	select ARM_DMA_USE_IOMMU

	select OMAP_IOMMU

	select VIDEOBUF2_DMA_CONTIG
@@ -113,6 +114,7 @@ config VIDEO_S3C_CAMIF 
	depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API

	depends on PM_RUNTIME

	depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG

	---help---

	  This is a v4l2 driver for s3c24xx and s3c64xx SoC series camera
@@ -143,6 +145,7 @@ if V4L_MEM2MEM_DRIVERS 
config VIDEO_CODA

	tristate "Chips&Media Coda multi-standard codec IP"

	depends on VIDEO_DEV && VIDEO_V4L2 && ARCH_MXC

	depends on HAS_DMA

	select SRAM

	select VIDEOBUF2_DMA_CONTIG

	select V4L2_MEM2MEM_DEV
@@ -154,6 +157,7 @@ config VIDEO_CODA 
config VIDEO_MEM2MEM_DEINTERLACE

	tristate "Deinterlace support"

	depends on VIDEO_DEV && VIDEO_V4L2 && DMA_ENGINE

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG

	select V4L2_MEM2MEM_DEV

	help
@@ -163,6 +167,7 @@ config VIDEO_SAMSUNG_S5P_G2D 
	tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"

	depends on VIDEO_DEV && VIDEO_V4L2

	depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG

	select V4L2_MEM2MEM_DEV

	default n
@@ -174,6 +179,7 @@ config VIDEO_SAMSUNG_S5P_JPEG 
	tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver"

	depends on VIDEO_DEV && VIDEO_V4L2

	depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG

	select V4L2_MEM2MEM_DEV

	---help---
@@ -184,6 +190,7 @@ config VIDEO_SAMSUNG_S5P_MFC 
	tristate "Samsung S5P MFC Video Codec"

	depends on VIDEO_DEV && VIDEO_V4L2

	depends on PLAT_S5P || ARCH_EXYNOS || COMPILE_TEST

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG

	default n

	help
@@ -193,6 +200,7 @@ config VIDEO_MX2_EMMAPRP 
	tristate "MX2 eMMa-PrP support"

	depends on VIDEO_DEV && VIDEO_V4L2

	depends on SOC_IMX27 || COMPILE_TEST

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG

	select V4L2_MEM2MEM_DEV

	help
@@ -204,6 +212,7 @@ config VIDEO_SAMSUNG_EXYNOS_GSC 
	tristate "Samsung Exynos G-Scaler driver"

	depends on VIDEO_DEV && VIDEO_V4L2

	depends on ARCH_EXYNOS5 || COMPILE_TEST

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG

	select V4L2_MEM2MEM_DEV

	help
@@ -212,6 +221,7 @@ config VIDEO_SAMSUNG_EXYNOS_GSC 
config VIDEO_SH_VEU

	tristate "SuperH VEU mem2mem video processing driver"

	depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG

	select V4L2_MEM2MEM_DEV

	help
@@ -221,6 +231,7 @@ config VIDEO_SH_VEU 
config VIDEO_RENESAS_VSP1

	tristate "Renesas VSP1 Video Processing Engine"

	depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAS_DMA

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG

	---help---

	  This is a V4L2 driver for the Renesas VSP1 video processing engine.
@@ -232,6 +243,7 @@ config VIDEO_TI_VPE 
	tristate "TI VPE (Video Processing Engine) driver"

	depends on VIDEO_DEV && VIDEO_V4L2

	depends on SOC_DRA7XX || COMPILE_TEST

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG

	select V4L2_MEM2MEM_DEV

	default n

drivers/media/platform/blackfin/Kconfig

+1 −0
Original line number Diff line number Diff line 
config VIDEO_BLACKFIN_CAPTURE

	tristate "Blackfin Video Capture Driver"

	depends on VIDEO_V4L2 && BLACKFIN && I2C

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG

	help

	  V4L2 bridge driver for Blackfin video capture device.

drivers/media/platform/davinci/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config VIDEO_DAVINCI_VPIF_DISPLAY 
	tristate "TI DaVinci VPIF V4L2-Display driver"

	depends on VIDEO_DEV

	depends on ARCH_DAVINCI || COMPILE_TEST

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG

	select VIDEO_ADV7343 if MEDIA_SUBDRV_AUTOSELECT

	select VIDEO_THS7303 if MEDIA_SUBDRV_AUTOSELECT
@@ -17,6 +18,7 @@ config VIDEO_DAVINCI_VPIF_CAPTURE 
	tristate "TI DaVinci VPIF video capture driver"

	depends on VIDEO_DEV

	depends on ARCH_DAVINCI || COMPILE_TEST

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG

	help

	  Enables Davinci VPIF module used for capture devices.
@@ -30,6 +32,7 @@ config VIDEO_DM6446_CCDC 
	tristate "TI DM6446 CCDC video capture driver"

	depends on VIDEO_V4L2

	depends on ARCH_DAVINCI || ARCH_OMAP3 || COMPILE_TEST

	depends on HAS_DMA

	select VIDEOBUF_DMA_CONTIG

	help

	   Enables DaVinci CCD hw module. DaVinci CCDC hw interfaces
@@ -45,6 +48,7 @@ config VIDEO_DM355_CCDC 
	tristate "TI DM355 CCDC video capture driver"

	depends on VIDEO_V4L2

	depends on ARCH_DAVINCI || COMPILE_TEST

	depends on HAS_DMA

	select VIDEOBUF_DMA_CONTIG

	help

	   Enables DM355 CCD hw module. DM355 CCDC hw interfaces
@@ -59,6 +63,7 @@ config VIDEO_DM355_CCDC 
config VIDEO_DM365_ISIF

	tristate "TI DM365 ISIF video capture driver"

	depends on VIDEO_V4L2 && ARCH_DAVINCI

	depends on HAS_DMA

	select VIDEOBUF_DMA_CONTIG

	help

	   Enables ISIF hw module. This is the hardware module for
@@ -71,6 +76,7 @@ config VIDEO_DM365_ISIF 
config VIDEO_DAVINCI_VPBE_DISPLAY

	tristate "TI DaVinci VPBE V4L2-Display driver"

	depends on ARCH_DAVINCI

	depends on HAS_DMA

	select VIDEOBUF2_DMA_CONTIG

	help

	    Enables Davinci VPBE module used for display devices.