| From 462492e9b32b05a071692ffbef568aac88b1b429 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 3 Jun 2021 18:40:55 -0700 |
| Subject: drm/pl111: Actually fix CONFIG_VEXPRESS_CONFIG depends |
| |
| From: Kees Cook <keescook@chromium.org> |
| |
| [ Upstream commit 4e566003571244f508408f59ce78f6ac2ccdba8e ] |
| |
| 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 |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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..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 |
| -- |
| 2.30.2 |
| |
