[PATCH] drm: aspeed: Select CMA only if available

Joel Stanley joel at jms.id.au
Fri Apr 5 05:28:30 UTC 2019


When building this driver for architectures where CMA is not available.

Fixes: 4f2a8f5898ec ("drm: Add ASPEED GFX driver")
Reported-by: Stephen Rothwell <sfr at canb.auug.org.au>
Reported-by: kernel test robot <lkp at intel.com>
Signed-off-by: Joel Stanley <joel at jms.id.au>
---
This fixes the build break.

Another question is if we need to select this at all, as we have a
reserved memory region to allocate from. I am not familiar with this
area, so advice is welcome.

 drivers/gpu/drm/aspeed/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/aspeed/Kconfig b/drivers/gpu/drm/aspeed/Kconfig
index 42b74d18a41b..1775fb85ec74 100644
--- a/drivers/gpu/drm/aspeed/Kconfig
+++ b/drivers/gpu/drm/aspeed/Kconfig
@@ -4,8 +4,8 @@ config DRM_ASPEED_GFX
 	select DRM_KMS_HELPER
 	select DRM_KMS_CMA_HELPER
 	select DRM_PANEL
-	select DMA_CMA
-	select CMA
+	select DMA_CMA if HAVE_DMA_CONTIGUOUS
+	select CMA if HAVE_DMA_CONTIGUOUS
 	select MFD_SYSCON
 	help
 	  Chose this option if you have an ASPEED AST2500 SOC Display
-- 
2.20.1



More information about the dri-devel mailing list