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

diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c
index 814ef5c20c08ee42c4a9a316b9e97d4955e7a882..cb6ea9975f13403249a436d76abc75e04969e90e 100644 (file)
--- a/drivers/gpu/drm/drm_panic.c
+++ b/drivers/gpu/drm/drm_panic.c
@@ -78,7 +78,7 @@ static struct drm_panic_line panic_msg[] = {
        PANIC_LINE("Please reboot your computer."),
 };
 
-static const struct drm_panic_line logo[] = {
+static const struct drm_panic_line logo_ascii[] = {
        PANIC_LINE("     .--.        _"),
        PANIC_LINE("    |o_o |      | |"),
        PANIC_LINE("    |:_/ |      | |"),
@@ -447,7 +447,7 @@ static void draw_txt_rectangle(struct drm_scanout_buffer *sb,
 static void draw_panic_static_user(struct drm_scanout_buffer *sb)
 {
        size_t msg_lines = ARRAY_SIZE(panic_msg);
-       size_t logo_lines = ARRAY_SIZE(logo);
+       size_t logo_ascii_lines = ARRAY_SIZE(logo_ascii);
        u32 fg_color = convert_from_xrgb8888(CONFIG_DRM_PANIC_FOREGROUND_COLOR, sb->format->format);
        u32 bg_color = convert_from_xrgb8888(CONFIG_DRM_PANIC_BACKGROUND_COLOR, sb->format->format);
        const struct font_desc *font = get_default_font(sb->width, sb->height, NULL, NULL);
@@ -459,8 +459,8 @@ static void draw_panic_static_user(struct drm_scanout_buffer *sb)
        r_screen = DRM_RECT_INIT(0, 0, sb->width, sb->height);
 
        r_logo = DRM_RECT_INIT(0, 0,
-                              get_max_line_len(logo, logo_lines) * font->width,
-                              logo_lines * font->height);
+                              get_max_line_len(logo_ascii, logo_ascii_lines) * font->width,
+                              logo_ascii_lines * font->height);
        r_msg = DRM_RECT_INIT(0, 0,
                              min(get_max_line_len(panic_msg, msg_lines) * font->width, sb->width),
                              min(msg_lines * font->height, sb->height));
@@ -473,7 +473,8 @@ static void draw_panic_static_user(struct drm_scanout_buffer *sb)
 
        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) {
-               draw_txt_rectangle(sb, font, logo, logo_lines, false, &r_logo, fg_color);
+               draw_txt_rectangle(sb, font, logo_ascii, logo_ascii_lines, false, &r_logo,
+                                  fg_color);
        }
        draw_txt_rectangle(sb, font, panic_msg, msg_lines, true, &r_msg, fg_color);
 }