]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/panic: Fix expected string for QR_CODE in drm_panic_type_map
authorNathan Chancellor <nathan@kernel.org>
Tue, 6 Jan 2026 06:19:27 +0000 (23:19 -0700)
committerTvrtko Ursulin <tursulin@ursulin.net>
Fri, 9 Jan 2026 08:53:27 +0000 (08:53 +0000)
The help text of CONFIG_DRM_PANIC_SCREEN_QR_CODE documents the expected
value to CONFIG_DRM_PANIC_SCREEN as "qr_code" but drm_panic_type_map
checks for "qr". Adjust drm_panic_type_map and the module description to
match so that existing configurations do not stop working.

Fixes: e85e9ccf3f84 ("drm/panic: Report invalid or unsupported panic modes")
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>
Link: https://lore.kernel.org/r/20260105-drm_panic-handle-invalid-drm_panic_screen-v1-2-55228bd4b0f8@kernel.org
drivers/gpu/drm/drm_panic.c

index 0cd574dd9d883a7ad11d9acd1507b51e4376743a..d6d3b8d85dea252458e82dd3ab18a5c63001f190 100644 (file)
@@ -823,7 +823,7 @@ static const char *drm_panic_type_map[] = {
        [DRM_PANIC_TYPE_KMSG] = "kmsg",
        [DRM_PANIC_TYPE_USER] = "user",
 #if IS_ENABLED(CONFIG_DRM_PANIC_SCREEN_QR_CODE)
-       [DRM_PANIC_TYPE_QR] = "qr",
+       [DRM_PANIC_TYPE_QR] = "qr_code",
 #endif
 };
 
@@ -855,7 +855,7 @@ static const struct kernel_param_ops drm_panic_ops = {
 module_param_cb(panic_screen, &drm_panic_ops, NULL, 0644);
 MODULE_PARM_DESC(panic_screen,
 #if IS_ENABLED(CONFIG_DRM_PANIC_SCREEN_QR_CODE)
-                "Choose what will be displayed by drm_panic, 'user', 'kmsg' or 'qr' [default="
+                "Choose what will be displayed by drm_panic, 'user', 'kmsg' or 'qr_code' [default="
 #else
                 "Choose what will be displayed by drm_panic, 'user' or 'kmsg' [default="
 #endif