drm/panic: Fix overlap between qr code and logo

The borders of the qr code was not taken into account to check if it
overlap with the logo, leading to the logo being partially covered.

Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://lore.kernel.org/r/20251009122955.562888-3-jfalempe@redhat.com
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>

diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c
index 23ba791c6131b39561b4c7c2fadef4eb33f54e4e..179cbf21f22de7058e7eff24f379581f8892c376 100644 (file)
--- a/drivers/gpu/drm/drm_panic.c
+++ b/drivers/gpu/drm/drm_panic.c
@@ -749,7 +749,7 @@ static int _draw_panic_static_qr_code(struct drm_scanout_buffer *sb)
        /* Fill with the background color, and draw text on top */
        drm_panic_fill(sb, &r_screen, bg_color);
 
-       if (!drm_rect_overlap(&r_logo, &r_msg) && !drm_rect_overlap(&r_logo, &r_qr))
+       if (!drm_rect_overlap(&r_logo, &r_msg) && !drm_rect_overlap(&r_logo, &r_qr_canvas))
                drm_panic_logo_draw(sb, &r_logo, font, fg_color);
 
        draw_txt_rectangle(sb, font, panic_msg, panic_msg_lines, true, &r_msg, fg_color);