Commit f9c88aa5 authored by Dave Airlie's avatar Dave Airlie

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
...@@ -2,6 +2,7 @@ config DRM_ZYNQMP_DPSUB ...@@ -2,6 +2,7 @@ config DRM_ZYNQMP_DPSUB
tristate "ZynqMP DisplayPort Controller Driver" tristate "ZynqMP DisplayPort Controller Driver"
depends on ARCH_ZYNQMP || COMPILE_TEST depends on ARCH_ZYNQMP || COMPILE_TEST
depends on COMMON_CLK && DRM && OF depends on COMMON_CLK && DRM && OF
depends on DMADEVICES
select DMA_ENGINE select DMA_ENGINE
select DRM_GEM_CMA_HELPER select DRM_GEM_CMA_HELPER
select DRM_KMS_CMA_HELPER select DRM_KMS_CMA_HELPER
......
...@@ -37,7 +37,7 @@ config RAPIDIO_ENABLE_RX_TX_PORTS ...@@ -37,7 +37,7 @@ config RAPIDIO_ENABLE_RX_TX_PORTS
config RAPIDIO_DMA_ENGINE config RAPIDIO_DMA_ENGINE
bool "DMA Engine support for RapidIO" bool "DMA Engine support for RapidIO"
depends on RAPIDIO depends on RAPIDIO
select DMADEVICES depends on DMADEVICES
select DMA_ENGINE select DMA_ENGINE
help help
Say Y here if you want to use DMA Engine frameork for RapidIO data Say Y here if you want to use DMA Engine frameork for RapidIO data
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment