]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 3 Aug 2024 07:00:00 +0000 (09:00 +0200)
[ Upstream commit 94ff11d3bd32506710ca43569d38420e7fc790c1 ]

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
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/drm_panic.c

index 056494ae1edef21614607a2702ab025085b71cb7..e1c47966856921bef875aafb3850dd2a990800ba 100644 (file)
@@ -439,7 +439,7 @@ static void draw_panic_static(struct drm_scanout_buffer *sb)
                       bg_color, sb->format->cpp[0]);
 
        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);