]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/panic: depends on !VT_CONSOLE
authorJocelyn Falempe <jfalempe@redhat.com>
Thu, 13 Jun 2024 15:40:16 +0000 (17:40 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 3 Aug 2024 07:00:01 +0000 (09:00 +0200)
[ Upstream commit 1ac6ac9ec069ed0cfdb1c207ae23f6c40ac57437 ]

The race condition between fbcon and drm_panic can only occurs if
VT_CONSOLE is set. So update drm_panic dependency accordingly.
This will make it easier for Linux distributions to enable drm_panic
by disabling VT_CONSOLE, and keeping fbcon terminal.
The only drawback is that fbcon won't display the boot kmsg, so it
should rely on userspace to do that.
At least plymouth already handle this case with
https://gitlab.freedesktop.org/plymouth/plymouth/-/merge_requests/224

Suggested-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240613154041.325964-1-jfalempe@redhat.com
Stable-dep-of: e044e707fc97 ("drm/panic: Do not select DRM_KMS_HELPER")
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/Kconfig

index d0aa277fc3bff842c641a9fe3ba8e2c74390da70..3e286236aa430788bcd026a3b34da8fa2192b69a 100644 (file)
@@ -106,7 +106,7 @@ config DRM_KMS_HELPER
 
 config DRM_PANIC
        bool "Display a user-friendly message when a kernel panic occurs"
-       depends on DRM && !FRAMEBUFFER_CONSOLE
+       depends on DRM && !(FRAMEBUFFER_CONSOLE && VT_CONSOLE)
        select DRM_KMS_HELPER
        select FONT_SUPPORT
        help