Merge tag 'for-5.19/parisc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...

[linux-2.6-microblaze.git] / drivers / video / console / sticore.c

diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 6a947ff..fa23bf0 100644 (file)
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -550,6 +550,26 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
 }
 #endif
 
+static void sti_dump_font(struct sti_cooked_font *font)
+{
+#ifdef STI_DUMP_FONT
+       unsigned char *p = (unsigned char *)font->raw;
+       int n;
+
+       p += sizeof(struct sti_rom_font);
+       pr_debug("  w %d h %d bpc %d\n", font->width, font->height,
+                                       font->raw->bytes_per_char);
+
+       for (n = 0; n < 256 * font->raw->bytes_per_char; n += 16, p += 16) {
+               pr_debug("        0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x,"
+                       " 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x,"
+                       " 0x%02x, 0x%02x, 0x%02x, 0x%02x,\n",
+                       p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8],
+                       p[9], p[10], p[11], p[12], p[13], p[14], p[15]);
+       }
+#endif
+}
+
 static int sti_search_font(struct sti_cooked_rom *rom, int height, int width)
 {
        struct sti_cooked_font *font;
@@ -797,6 +817,7 @@ static int sti_read_rom(int wordmode, struct sti_struct *sti,
        sti->font->width = sti->font->raw->width;
        sti->font->height = sti->font->raw->height;
        sti_font_convert_bytemode(sti, sti->font);
+       sti_dump_font(sti->font);
 
        sti->sti_mem_request = raw->sti_mem_req;
        sti->graphics_id[0] = raw->graphics_id[0];