summaryrefslogtreecommitdiff
path: root/drivers/gpu
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2021-06-03 18:40:55 -0700
committerLinus Walleij <linus.walleij@linaro.org>2021-06-04 15:02:26 +0200
commit4e566003571244f508408f59ce78f6ac2ccdba8e (patch)
tree4bffacab8cd46e0e46ebd582e02d2358b6c6f056 /drivers/gpu
parent0c6b522abc2a592468992780babd3c3629c7ceac (diff)
drm/pl111: Actually fix CONFIG_VEXPRESS_CONFIG depends
VEXPRESS_CONFIG needs to either be missing, built-in, or modular when pl111 is modular. Update the Kconfig to reflect the need. Fixes: 4dc7c97d04dc ("drm/pl111: depend on CONFIG_VEXPRESS_CONFIG") Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20210604014055.4060521-1-keescook@chromium.org
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/pl111/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/pl111/Kconfig b/drivers/gpu/drm/pl111/Kconfig
index c5210a5bef1b..3aae387a96af 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=n
depends on COMMON_CLK
select DRM_KMS_HELPER
select DRM_KMS_CMA_HELPER