[PATCH v2] drm/pl111: Fix CONFIG_VEXPRESS_CONFIG depend

From: Kees Cook
Date: Thu Jun 03 2021 - 17:35:23 EST


Avoid randconfig build failures by requiring VEXPRESS_CONFIG either be
missing, built-in, or modular when pl111 is modular. Fixing this warning
when:

CONFIG_VEXPRESS_CONFIG=m
CONFIG_DRM_PL111=y

aarch64-linux-gnu-ld: drivers/gpu/drm/pl111/pl111_versatile.o: in function `pl111_vexpress_clcd_init':
pl111_versatile.c:(.text+0x220): undefined reference to `devm_regmap_init_vexpress_config'

Reported-by: kernel test robot <lkp@xxxxxxxxx>
Link: https://lore.kernel.org/lkml/202105300926.fX0MYySp-lkp@xxxxxxxxx/
Fixes: 826fc86b5903 ("drm: pl111: Move VExpress setup into versatile init")
Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
---
v2: avoid forcing VEXPRESS_CONFIG be enabled
v1: https://lore.kernel.org/lkml/20210602215252.695994-4-keescook@xxxxxxxxxxxx
---
drivers/gpu/drm/pl111/Kconfig | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/pl111/Kconfig b/drivers/gpu/drm/pl111/Kconfig
index 80f6748055e3..b84879ca430d 100644
--- a/drivers/gpu/drm/pl111/Kconfig
+++ b/drivers/gpu/drm/pl111/Kconfig
@@ -3,6 +3,7 @@ config DRM_PL111
tristate "DRM Support for PL111 CLCD Controller"
depends on DRM
depends on ARM || ARM64 || COMPILE_TEST
+ depends on !VEXPRESS_CONFIG || VEXPRESS_CONFIG=DRM
depends on COMMON_CLK
select DRM_KMS_HELPER
select DRM_KMS_CMA_HELPER
--
2.25.1