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 --- v2: use expected Kconfig style to express this. :) v1: https://lore.kernel.org/lkml/20210603215819.3904733-1-keescook@chromium.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
On Fri, Jun 4, 2021 at 3:41 AM Kees Cook keescook@chromium.org wrote:
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")
Yeah that doesn't work, thanks for fixing this!
Signed-off-by: Kees Cook keescook@chromium.org
depends on VEXPRESS_CONFIG
depends on ARM || ARM64 || COMPILE_TEST
depends on VEXPRESS_CONFIG || VEXPRESS_CONFIG=n
That's the right solution, Reviewed-by: Linus Walleij linus.walleij@linaro.org
Yours, Linus Walleij
On Fri, Jun 04, 2021 at 09:44:59AM +0200, Linus Walleij wrote:
On Fri, Jun 4, 2021 at 3:41 AM Kees Cook keescook@chromium.org wrote:
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")
Yeah that doesn't work, thanks for fixing this!
Signed-off-by: Kees Cook keescook@chromium.org
depends on VEXPRESS_CONFIG
depends on ARM || ARM64 || COMPILE_TEST
depends on VEXPRESS_CONFIG || VEXPRESS_CONFIG=n
That's the right solution, Reviewed-by: Linus Walleij linus.walleij@linaro.org
Since I screwed up already, care to also push this to drm-misc-next?
Thanks, Daniel
On Fri, Jun 4, 2021 at 11:15 AM Daniel Vetter daniel@ffwll.ch wrote:
On Fri, Jun 04, 2021 at 09:44:59AM +0200, Linus Walleij wrote:
On Fri, Jun 4, 2021 at 3:41 AM Kees Cook keescook@chromium.org wrote:
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")
Yeah that doesn't work, thanks for fixing this!
Signed-off-by: Kees Cook keescook@chromium.org
depends on VEXPRESS_CONFIG
depends on ARM || ARM64 || COMPILE_TEST
depends on VEXPRESS_CONFIG || VEXPRESS_CONFIG=n
That's the right solution, Reviewed-by: Linus Walleij linus.walleij@linaro.org
Since I screwed up already, care to also push this to drm-misc-next?
OK I applied and pushed it!
Yours, Linus Walleij
On Thu, Jun 3, 2021 at 8:40 PM Kees Cook keescook@chromium.org wrote:
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
v2: use expected Kconfig style to express this. :) v1: https://lore.kernel.org/lkml/20210603215819.3904733-1-keescook@chromium.org
drivers/gpu/drm/pl111/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Acked-by: Rob Herring robh@kernel.org
dri-devel@lists.freedesktop.org