Commit 6abb6a0e authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Tvrtko Ursulin
Browse files

drm/panic: Fix expected string for QR_CODE in drm_panic_type_map 



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: e85e9ccf ("drm/panic: Report invalid or unsupported panic modes")
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@igalia.com>
Reviewed-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Signed-off-by: default avatarTvrtko Ursulin <tursulin@ursulin.net>
Link: https://lore.kernel.org/r/20260105-drm_panic-handle-invalid-drm_panic_screen-v1-2-55228bd4b0f8@kernel.org
parent 6419fc15

drivers/gpu/drm/drm_panic.c

+2 −2
Original line number Diff line number Diff line
@@ -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