6.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jocelyn Falempe <jfalempe@xxxxxxxxxx> [ 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@xxxxxxxx> Signed-off-by: Jocelyn Falempe <jfalempe@xxxxxxxxxx> Reviewed-by: Javier Martinez Canillas <javierm@xxxxxxxxxx> Link: https://patchwork.freedesktop.org/patch/msgid/20240613154041.325964-1-jfalempe@xxxxxxxxxx Stable-dep-of: e044e707fc97 ("drm/panic: Do not select DRM_KMS_HELPER") Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> --- drivers/gpu/drm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index d0aa277fc3bff..3e286236aa430 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -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 -- 2.43.0
