Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/panic: Rename logo to logo_ascii

Rename variables related to the ASCII logo, to prepare for the advent of
support for graphical logos.

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/df77372c16153655c321a290b5a3191ee2dcbc6b.1718305355.git.geert+renesas@glider.be

authored by

Geert Uytterhoeven and committed by
Jocelyn Falempe
a40d031d a3dfb1d1

+6 -5
+6 -5
drivers/gpu/drm/drm_panic.c
··· 78 78 PANIC_LINE("Please reboot your computer."), 79 79 }; 80 80 81 - static const struct drm_panic_line logo[] = { 81 + static const struct drm_panic_line logo_ascii[] = { 82 82 PANIC_LINE(" .--. _"), 83 83 PANIC_LINE(" |o_o | | |"), 84 84 PANIC_LINE(" |:_/ | | |"), ··· 447 447 static void draw_panic_static_user(struct drm_scanout_buffer *sb) 448 448 { 449 449 size_t msg_lines = ARRAY_SIZE(panic_msg); 450 - size_t logo_lines = ARRAY_SIZE(logo); 450 + size_t logo_ascii_lines = ARRAY_SIZE(logo_ascii); 451 451 u32 fg_color = convert_from_xrgb8888(CONFIG_DRM_PANIC_FOREGROUND_COLOR, sb->format->format); 452 452 u32 bg_color = convert_from_xrgb8888(CONFIG_DRM_PANIC_BACKGROUND_COLOR, sb->format->format); 453 453 const struct font_desc *font = get_default_font(sb->width, sb->height, NULL, NULL); ··· 459 459 r_screen = DRM_RECT_INIT(0, 0, sb->width, sb->height); 460 460 461 461 r_logo = DRM_RECT_INIT(0, 0, 462 - get_max_line_len(logo, logo_lines) * font->width, 463 - logo_lines * font->height); 462 + get_max_line_len(logo_ascii, logo_ascii_lines) * font->width, 463 + logo_ascii_lines * font->height); 464 464 r_msg = DRM_RECT_INIT(0, 0, 465 465 min(get_max_line_len(panic_msg, msg_lines) * font->width, sb->width), 466 466 min(msg_lines * font->height, sb->height)); ··· 473 473 474 474 if ((r_msg.x1 >= drm_rect_width(&r_logo) || r_msg.y1 >= drm_rect_height(&r_logo)) && 475 475 drm_rect_width(&r_logo) <= sb->width && drm_rect_height(&r_logo) <= sb->height) { 476 - draw_txt_rectangle(sb, font, logo, logo_lines, false, &r_logo, fg_color); 476 + draw_txt_rectangle(sb, font, logo_ascii, logo_ascii_lines, false, &r_logo, 477 + fg_color); 477 478 } 478 479 draw_txt_rectangle(sb, font, panic_msg, msg_lines, true, &r_msg, fg_color); 479 480 }