[PATCH 2/2] drm/panic: Fix expected string for QR_CODE in drm_panic_type_map

Nathan Chancellor posted 2 patches 1 month ago
[PATCH 2/2] drm/panic: Fix expected string for QR_CODE in drm_panic_type_map
Posted by Nathan Chancellor 1 month ago
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
Re: [PATCH 2/2] drm/panic: Fix expected string for QR_CODE in drm_panic_type_map
Posted by Jocelyn Falempe 1 month ago
On 06/01/2026 07:19, Nathan Chancellor wrote:
> 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.

Good catch, thanks for the fix.

Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
> 
> 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
>
Re: [PATCH 2/2] drm/panic: Fix expected string for QR_CODE in drm_panic_type_map
Posted by Tvrtko Ursulin 1 month ago
On 06/01/2026 06:19, Nathan Chancellor wrote:
> 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
> 

Looks like I mistyped when refactoring. Should have used copy and paste, 
sorry about that.

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>

Regards,

Tvrtko