[PATCH v2] drm: aspeed: Clean up Kconfig options

[Daniel Vetter]

On Fri, Apr 05, 2019 at 06:41:17PM +1030, Joel Stanley wrote:
> 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 at canb.auug.org.au>
> Reported-by: kernel test robot <lkp at intel.com>
> Signed-off-by: Joel Stanley <joel at jms.id.au>

Acked-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Iirc you have commit rights, right?
-Daniel
> ---
> This fixes the powerpc next-20190405 build. Sorry Stephen!
> 
> v2: Clean up as well as fix the build
> v1: https://lore.kernel.org/lkml/20190405052830.27899-1-joel@jms.id.au/
> 
>  drivers/gpu/drm/aspeed/Kconfig | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/aspeed/Kconfig b/drivers/gpu/drm/aspeed/Kconfig
> index 42b74d18a41b..cccab520e02f 100644
> --- a/drivers/gpu/drm/aspeed/Kconfig
> +++ b/drivers/gpu/drm/aspeed/Kconfig
> @@ -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
> -- 
> 2.20.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch