| Message ID | 20190405052830.27899-1-joel@jms.id.au |
|---|---|
| State | New |
| Headers | show |
| Series | drm: aspeed: Select CMA only if available | expand |
Den 05.04.2019 07.28, skrev Joel Stanley: > When building this driver for architectures where CMA is not available. > > 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> > --- > 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 I'm no expert on this, but the rule is that you should not select options that are user visible which both of these are. The user should select them. So I believe that you should remove them. Docs: Documentation/kbuild/kconfig-language.txt Noralf. > select MFD_SYSCON > help > Chose this option if you have an ASPEED AST2500 SOC Display >
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
When building this driver for architectures where CMA is not available. 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> --- 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(-)