| Message ID | 20170111133357.3664191-2-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Mittwoch, den 11.01.2017, 14:33 +0100 schrieb Arnd Bergmann: > 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: 011cda589938 ("drm: fix compilations issues introduced by "drm: allow to use mmuless SoC"") > Fixes: 62a0d98a188c ("drm: allow to use mmuless SoC") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Lucas Stach <l.stach@pengutronix.de> > --- > drivers/gpu/drm/armada/Kconfig | 2 +- > drivers/gpu/drm/etnaviv/Kconfig | 1 + > drivers/gpu/drm/msm/Kconfig | 1 + > 3 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/armada/Kconfig b/drivers/gpu/drm/armada/Kconfig > index 15f3ecfb16f1..eafaeeb7b5b1 100644 > --- a/drivers/gpu/drm/armada/Kconfig > +++ b/drivers/gpu/drm/armada/Kconfig > @@ -1,6 +1,6 @@ > config DRM_ARMADA > tristate "DRM support for Marvell Armada SoCs" > - depends on DRM && HAVE_CLK && ARM > + depends on DRM && HAVE_CLK && ARM && MMU > select DRM_KMS_HELPER > help > Support the "LCD" controllers found on the Marvell Armada 510 > diff --git a/drivers/gpu/drm/etnaviv/Kconfig b/drivers/gpu/drm/etnaviv/Kconfig > index 2cde7a5442fb..656c061b439d 100644 > --- a/drivers/gpu/drm/etnaviv/Kconfig > +++ b/drivers/gpu/drm/etnaviv/Kconfig > @@ -3,6 +3,7 @@ config DRM_ETNAVIV > tristate "ETNAVIV (DRM support for Vivante GPU IP cores)" > depends on DRM > depends on ARCH_MXC || ARCH_DOVE > + depends on MMU > select SHMEM > select TMPFS > select IOMMU_API > diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig > index d96b2b6898a3..7f78da695dff 100644 > --- a/drivers/gpu/drm/msm/Kconfig > +++ b/drivers/gpu/drm/msm/Kconfig > @@ -4,6 +4,7 @@ config DRM_MSM > depends on DRM > depends on ARCH_QCOM || (ARM && COMPILE_TEST) > depends on OF && COMMON_CLK > + depends on MMU > select REGULATOR > select DRM_KMS_HELPER > select DRM_PANEL
On Wed, Jan 11, 2017 at 03:02:39PM +0100, Lucas Stach wrote: > Am Mittwoch, den 11.01.2017, 14:33 +0100 schrieb Arnd Bergmann: > > 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: 011cda589938 ("drm: fix compilations issues introduced by "drm: allow to use mmuless SoC"") > > Fixes: 62a0d98a188c ("drm: allow to use mmuless SoC") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Acked-by: Lucas Stach <l.stach@pengutronix.de> Applied to drm-misc, thanks. -Daniel > > > --- > > drivers/gpu/drm/armada/Kconfig | 2 +- > > drivers/gpu/drm/etnaviv/Kconfig | 1 + > > drivers/gpu/drm/msm/Kconfig | 1 + > > 3 files changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/armada/Kconfig b/drivers/gpu/drm/armada/Kconfig > > index 15f3ecfb16f1..eafaeeb7b5b1 100644 > > --- a/drivers/gpu/drm/armada/Kconfig > > +++ b/drivers/gpu/drm/armada/Kconfig > > @@ -1,6 +1,6 @@ > > config DRM_ARMADA > > tristate "DRM support for Marvell Armada SoCs" > > - depends on DRM && HAVE_CLK && ARM > > + depends on DRM && HAVE_CLK && ARM && MMU > > select DRM_KMS_HELPER > > help > > Support the "LCD" controllers found on the Marvell Armada 510 > > diff --git a/drivers/gpu/drm/etnaviv/Kconfig b/drivers/gpu/drm/etnaviv/Kconfig > > index 2cde7a5442fb..656c061b439d 100644 > > --- a/drivers/gpu/drm/etnaviv/Kconfig > > +++ b/drivers/gpu/drm/etnaviv/Kconfig > > @@ -3,6 +3,7 @@ config DRM_ETNAVIV > > tristate "ETNAVIV (DRM support for Vivante GPU IP cores)" > > depends on DRM > > depends on ARCH_MXC || ARCH_DOVE > > + depends on MMU > > select SHMEM > > select TMPFS > > select IOMMU_API > > diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig > > index d96b2b6898a3..7f78da695dff 100644 > > --- a/drivers/gpu/drm/msm/Kconfig > > +++ b/drivers/gpu/drm/msm/Kconfig > > @@ -4,6 +4,7 @@ config DRM_MSM > > depends on DRM > > depends on ARCH_QCOM || (ARM && COMPILE_TEST) > > depends on OF && COMMON_CLK > > + depends on MMU > > select REGULATOR > > select DRM_KMS_HELPER > > select DRM_PANEL > >
diff --git a/drivers/gpu/drm/armada/Kconfig b/drivers/gpu/drm/armada/Kconfig index 15f3ecfb16f1..eafaeeb7b5b1 100644 --- a/drivers/gpu/drm/armada/Kconfig +++ b/drivers/gpu/drm/armada/Kconfig @@ -1,6 +1,6 @@ config DRM_ARMADA tristate "DRM support for Marvell Armada SoCs" - depends on DRM && HAVE_CLK && ARM + depends on DRM && HAVE_CLK && ARM && MMU select DRM_KMS_HELPER help Support the "LCD" controllers found on the Marvell Armada 510 diff --git a/drivers/gpu/drm/etnaviv/Kconfig b/drivers/gpu/drm/etnaviv/Kconfig index 2cde7a5442fb..656c061b439d 100644 --- a/drivers/gpu/drm/etnaviv/Kconfig +++ b/drivers/gpu/drm/etnaviv/Kconfig @@ -3,6 +3,7 @@ config DRM_ETNAVIV tristate "ETNAVIV (DRM support for Vivante GPU IP cores)" depends on DRM depends on ARCH_MXC || ARCH_DOVE + depends on MMU select SHMEM select TMPFS select IOMMU_API diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index d96b2b6898a3..7f78da695dff 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -4,6 +4,7 @@ config DRM_MSM depends on DRM depends on ARCH_QCOM || (ARM && COMPILE_TEST) depends on OF && COMMON_CLK + depends on MMU select REGULATOR select DRM_KMS_HELPER select DRM_PANEL
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: 011cda589938 ("drm: fix compilations issues introduced by "drm: allow to use mmuless SoC"") Fixes: 62a0d98a188c ("drm: allow to use mmuless SoC") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/gpu/drm/armada/Kconfig | 2 +- drivers/gpu/drm/etnaviv/Kconfig | 1 + drivers/gpu/drm/msm/Kconfig | 1 + 3 files changed, 3 insertions(+), 1 deletion(-)