drm/panic: Fix off-by-one logo size checks
authorGeert Uytterhoeven <geert+renesas@glider.be>
Thu, 13 Jun 2024 19:18:00 +0000 (21:18 +0200)
committerJocelyn Falempe <jfalempe@redhat.com>
Mon, 24 Jun 2024 11:18:01 +0000 (13:18 +0200)
Logos that are either just as wide or just as high as the display work
fine.

Fixes: bf9fb17c6672868d ("drm/panic: Add a drm panic handler")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1c9d02463cef3eac22cfac3ac6d1adad369f367b.1718305355.git.geert+renesas@glider.be
drivers/gpu/drm/drm_panic.c

index fc04ed4e0b399f55468e290eb9b53e680b957a1a..814ef5c20c08ee42c4a9a316b9e97d4955e7a882 100644 (file)
@@ -472,7 +472,7 @@ static void draw_panic_static_user(struct drm_scanout_buffer *sb)
        drm_panic_fill(sb, &r_screen, bg_color);
 
        if ((r_msg.x1 >= drm_rect_width(&r_logo) || r_msg.y1 >= drm_rect_height(&r_logo)) &&
-           drm_rect_width(&r_logo) < sb->width && drm_rect_height(&r_logo) < sb->height) {
+           drm_rect_width(&r_logo) <= sb->width && drm_rect_height(&r_logo) <= sb->height) {
                draw_txt_rectangle(sb, font, logo, logo_lines, false, &r_logo, fg_color);
        }
        draw_txt_rectangle(sb, font, panic_msg, msg_lines, true, &r_msg, fg_color);