Commit f9c88aa5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xlnx-dpsub-fixes-20200905' of git://linuxtv.org/pinchartl/media into drm-fixes 



Kconfig fixes for DRM_ZYNQMP_DPSUB DMA engine dependency

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200905172751.GC6319@pendragon.ideasonboard.com
parents 20561da3 3e8b2403

drivers/gpu/drm/xlnx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config DRM_ZYNQMP_DPSUB 
	tristate "ZynqMP DisplayPort Controller Driver"

	depends on ARCH_ZYNQMP || COMPILE_TEST

	depends on COMMON_CLK && DRM && OF

	depends on DMADEVICES

	select DMA_ENGINE

	select DRM_GEM_CMA_HELPER

	select DRM_KMS_CMA_HELPER

drivers/rapidio/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ config RAPIDIO_ENABLE_RX_TX_PORTS 
config RAPIDIO_DMA_ENGINE

	bool "DMA Engine support for RapidIO"

	depends on RAPIDIO

	select DMADEVICES

	depends on DMADEVICES

	select DMA_ENGINE

	help

	  Say Y here if you want to use DMA Engine frameork for RapidIO data

CRA Git | Maintained and supported by SUSTech CRA and CCSE