]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm: aspeed: Clean up Kconfig options
authorJoel Stanley <joel@jms.id.au>
Fri, 5 Apr 2019 08:11:17 +0000 (18:41 +1030)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 16 Apr 2019 14:39:24 +0000 (16:39 +0200)
The GFX IP is inside of the ASPEED BMC SoC so there is little use
enabling it on a kernel that does not support ASPEED.

When building with COMPILE_TEST the architecture many not have CMA
support, so to avoid breaking the build we only select these options if
the architecture supports the contiguous allocator.

I suspect the DRM_PANEL came from a cut/paste error.

Fixes: 4f2a8f5898ec ("drm: Add ASPEED GFX driver")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20190405081117.27339-1-joel@jms.id.au
drivers/gpu/drm/aspeed/Kconfig

index 42b74d18a41b8f404212ee5be60c7fa755b69a9e..cccab520e02f3bd6fd40caa1106240444ddd6d4b 100644 (file)
@@ -1,11 +1,11 @@
 config DRM_ASPEED_GFX
        tristate "ASPEED BMC Display Controller"
        depends on DRM && OF
+       depends on (COMPILE_TEST || ARCH_ASPEED)
        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