VEXPRESS_CONFIG needs to either be missing, built-in, or modular when
pl111 is modular. Update the Kconfig to reflect the need.

Cc: Emma Anholt <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Daniel Vetter <[email protected]>
Cc: [email protected]
Fixes: 4dc7c97d04dc ("drm/pl111: depend on CONFIG_VEXPRESS_CONFIG")
Signed-off-by: Kees Cook <[email protected]>
---
 drivers/gpu/drm/pl111/Kconfig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/pl111/Kconfig b/drivers/gpu/drm/pl111/Kconfig
index c5210a5bef1b..b84879ca430d 100644
--- a/drivers/gpu/drm/pl111/Kconfig
+++ b/drivers/gpu/drm/pl111/Kconfig
@@ -2,7 +2,8 @@
 config DRM_PL111
        tristate "DRM Support for PL111 CLCD Controller"
        depends on DRM
-       depends on VEXPRESS_CONFIG
+       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

Reply via email to