From: Geert Uytterhoeven Date: Wed, 26 Jun 2024 08:41:44 +0000 (+0200) Subject: drm/panic: Do not select DRM_KMS_HELPER X-Git-Tag: v6.10.3~458 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c0fd0eba42528c856b8c204e0f5d81af38a3598b;p=thirdparty%2Fkernel%2Fstable.git drm/panic: Do not select DRM_KMS_HELPER [ Upstream commit e044e707fc97dac693691178cdf41fe1a8da928f ] DRM core code cannot call into DRM helper code, as this would lead to circular references in the modular case. Hence drop the selection of DRM_KMS_HELPER. It was unused anyway, as v10 switched from using the DRM format helpers to its own color format conversion, cfr. commit 9544309775c3 ("drm/panic: Add support for color format conversion"). Remove the unneeded include of . Fixes: bf9fb17c6672 ("drm/panic: Add a drm panic handler") Signed-off-by: Geert Uytterhoeven Reviewed-by: Jocelyn Falempe Signed-off-by: Jocelyn Falempe Link: https://patchwork.freedesktop.org/patch/msgid/60155f8c939ed286e324a7c12a1daa69fe49fcf6.1719391132.git.geert+renesas@glider.be Signed-off-by: Sasha Levin --- diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 3e286236aa430..359b68adafc1b 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -107,7 +107,6 @@ config DRM_KMS_HELPER config DRM_PANIC bool "Display a user-friendly message when a kernel panic occurs" depends on DRM && !(FRAMEBUFFER_CONSOLE && VT_CONSOLE) - select DRM_KMS_HELPER select FONT_SUPPORT help Enable a drm panic handler, which will display a user-friendly message diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index e1c4796685692..831b214975a51 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -15,7 +15,6 @@ #include #include -#include #include #include #include