From: Nathan Chancellor <nathan@kernel.org>
To: Jocelyn Falempe <jfalempe@redhat.com>,
Javier Martinez Canillas <javierm@redhat.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Nathan Chancellor <nathan@kernel.org>
Subject: [PATCH 2/2] drm/panic: Fix expected string for QR_CODE in drm_panic_type_map
Date: Mon, 05 Jan 2026 23:19:27 -0700 [thread overview]
Message-ID: <20260105-drm_panic-handle-invalid-drm_panic_screen-v1-2-55228bd4b0f8@kernel.org> (raw)
In-Reply-To: <20260105-drm_panic-handle-invalid-drm_panic_screen-v1-0-55228bd4b0f8@kernel.org>
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>
---
drivers/gpu/drm/drm_panic.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c
index 0cd574dd9d88..d6d3b8d85dea 100644
--- a/drivers/gpu/drm/drm_panic.c
+++ b/drivers/gpu/drm/drm_panic.c
@@ -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
--
2.52.0
next prev parent reply other threads:[~2026-01-06 6:19 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-06 6:19 [PATCH 0/2] drm/panic: Avoid crash from invalid CONFIG_DRM_PANIC_SCREEN values Nathan Chancellor
2026-01-06 6:19 ` [PATCH 1/2] drm/panic: Ensure drm_panic_type is initialized to a valid value Nathan Chancellor
2026-01-06 8:24 ` Tvrtko Ursulin
2026-01-06 21:32 ` Jocelyn Falempe
2026-01-06 6:19 ` Nathan Chancellor [this message]
2026-01-06 8:19 ` [PATCH 2/2] drm/panic: Fix expected string for QR_CODE in drm_panic_type_map Tvrtko Ursulin
2026-01-06 21:34 ` Jocelyn Falempe
2026-01-09 8:55 ` [PATCH 0/2] drm/panic: Avoid crash from invalid CONFIG_DRM_PANIC_SCREEN values Tvrtko Ursulin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260105-drm_panic-handle-invalid-drm_panic_screen-v1-2-55228bd4b0f8@kernel.org \
--to=nathan@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=javierm@redhat.com \
--cc=jfalempe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=tvrtko.ursulin@igalia.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®