| Message ID | 1c9d02463cef3eac22cfac3ac6d1adad369f367b.1718305355.git.geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 94ff11d3bd32506710ca43569d38420e7fc790c1 |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | drm/panic: Fixes and graphical logo | expand |
On 13/06/2024 21:18, Geert Uytterhoeven wrote: > Logos that are either just as wide or just as high as the display work > fine. Sure, that looks good to me. Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com> > > Fixes: bf9fb17c6672868d ("drm/panic: Add a drm panic handler") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > v2: > - Rebased. > --- > drivers/gpu/drm/drm_panic.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c > index fc04ed4e0b399f55..814ef5c20c08ee42 100644 > --- a/drivers/gpu/drm/drm_panic.c > +++ b/drivers/gpu/drm/drm_panic.c > @@ -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);
diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index fc04ed4e0b399f55..814ef5c20c08ee42 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -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);
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> --- v2: - Rebased. --- drivers/gpu/drm/drm_panic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)