Commit f0c379a1 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Daniel Vetter

drm: add more MMU dependencies

Many DRM drivers only work with an MMU, and after the patch to enable
core DRM support without MMU, we already had one fixup for many of them.
The etnaviv, armada and msm drivers were missed and have the same problem:

warning: (DRM_ETNAVIV) selects IOMMU_SUPPORT which has unmet direct dependencies (MMU)
warning: (DRM_I915 && DRM_MSM && DRM_ETNAVIV) selects SHMEM which has unmet direct dependencies (MMU)
drivers/gpu/drm/armada/armada_gem.o: In function `armada_gem_vm_fault':
armada_gem.c:(.text.armada_gem_vm_fault+0x14): undefined reference to `vm_insert_pfn'
arch/arm/mm/dma-mapping.c: In function '__iommu_alloc_remap':
arch/arm/mm/dma-mapping.c:1390:4: error: 'VM_ARM_DMA_CONSISTENT' undeclared (first use in this function)
arch/arm/mm/dma-mapping.c:1456:31: error: 'atomic_pool' undeclared (first use in this function); did you mean 'atomic_xor'?

Fixes: 011cda58 ("drm: fix compilations issues introduced by "drm: allow to use mmuless SoC"")
Fixes: 62a0d98a ("drm: allow to use mmuless SoC")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170111133357.3664191-2-arnd@arndb.de
parent 95b8c64a
config DRM_ARMADA config DRM_ARMADA
tristate "DRM support for Marvell Armada SoCs" tristate "DRM support for Marvell Armada SoCs"
depends on DRM && HAVE_CLK && ARM depends on DRM && HAVE_CLK && ARM && MMU
select DRM_KMS_HELPER select DRM_KMS_HELPER
help help
Support the "LCD" controllers found on the Marvell Armada 510 Support the "LCD" controllers found on the Marvell Armada 510
......
...@@ -3,6 +3,7 @@ config DRM_ETNAVIV ...@@ -3,6 +3,7 @@ config DRM_ETNAVIV
tristate "ETNAVIV (DRM support for Vivante GPU IP cores)" tristate "ETNAVIV (DRM support for Vivante GPU IP cores)"
depends on DRM depends on DRM
depends on ARCH_MXC || ARCH_DOVE depends on ARCH_MXC || ARCH_DOVE
depends on MMU
select SHMEM select SHMEM
select TMPFS select TMPFS
select IOMMU_API select IOMMU_API
......
...@@ -4,6 +4,7 @@ config DRM_MSM ...@@ -4,6 +4,7 @@ config DRM_MSM
depends on DRM depends on DRM
depends on ARCH_QCOM || (ARM && COMPILE_TEST) depends on ARCH_QCOM || (ARM && COMPILE_TEST)
depends on OF && COMMON_CLK depends on OF && COMMON_CLK
depends on MMU
select REGULATOR select REGULATOR
select DRM_KMS_HELPER select DRM_KMS_HELPER
select DRM_PANEL select DRM_PANEL
......
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