Commit ee6fbb20 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Bartlomiej Zolnierkiewicz

atyfb: fix debugging printks

This patch fixes the debugging printks. Use pr_cont, so that the lines are
not broken up. Use printk when starting a new line (a long string of
pr_cont's without any printks causes missing characters in the console
output on sparc).
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
parent 01c40a17
...@@ -1480,24 +1480,28 @@ static int atyfb_set_par(struct fb_info *info) ...@@ -1480,24 +1480,28 @@ static int atyfb_set_par(struct fb_info *info)
base = 0x2000; base = 0x2000;
printk("debug atyfb: Mach64 non-shadow register values:"); printk("debug atyfb: Mach64 non-shadow register values:");
for (i = 0; i < 256; i = i+4) { for (i = 0; i < 256; i = i+4) {
if (i % 16 == 0) if (i % 16 == 0) {
printk("\ndebug atyfb: 0x%04X: ", base + i); pr_cont("\n");
printk(" %08X", aty_ld_le32(i, par)); printk("debug atyfb: 0x%04X: ", base + i);
} }
printk("\n\n"); pr_cont(" %08X", aty_ld_le32(i, par));
}
pr_cont("\n\n");
#ifdef CONFIG_FB_ATY_CT #ifdef CONFIG_FB_ATY_CT
/* PLL registers */ /* PLL registers */
base = 0x00; base = 0x00;
printk("debug atyfb: Mach64 PLL register values:"); printk("debug atyfb: Mach64 PLL register values:");
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
if (i % 16 == 0) if (i % 16 == 0) {
printk("\ndebug atyfb: 0x%02X: ", base + i); pr_cont("\n");
printk("debug atyfb: 0x%02X: ", base + i);
}
if (i % 4 == 0) if (i % 4 == 0)
printk(" "); pr_cont(" ");
printk("%02X", aty_ld_pll_ct(i, par)); pr_cont("%02X", aty_ld_pll_ct(i, par));
} }
printk("\n\n"); pr_cont("\n\n");
#endif /* CONFIG_FB_ATY_CT */ #endif /* CONFIG_FB_ATY_CT */
#ifdef CONFIG_FB_ATY_GENERIC_LCD #ifdef CONFIG_FB_ATY_GENERIC_LCD
...@@ -1509,19 +1513,19 @@ static int atyfb_set_par(struct fb_info *info) ...@@ -1509,19 +1513,19 @@ static int atyfb_set_par(struct fb_info *info)
for (i = 0; i <= POWER_MANAGEMENT; i++) { for (i = 0; i <= POWER_MANAGEMENT; i++) {
if (i == EXT_VERT_STRETCH) if (i == EXT_VERT_STRETCH)
continue; continue;
printk("\ndebug atyfb: 0x%04X: ", pr_cont("\ndebug atyfb: 0x%04X: ",
lt_lcd_regs[i]); lt_lcd_regs[i]);
printk(" %08X", aty_ld_lcd(i, par)); pr_cont(" %08X", aty_ld_lcd(i, par));
} }
} else { } else {
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
if (i % 4 == 0) if (i % 4 == 0)
printk("\ndebug atyfb: 0x%02X: ", pr_cont("\ndebug atyfb: 0x%02X: ",
base + i); base + i);
printk(" %08X", aty_ld_lcd(i, par)); pr_cont(" %08X", aty_ld_lcd(i, par));
} }
} }
printk("\n\n"); pr_cont("\n\n");
} }
#endif /* CONFIG_FB_ATY_GENERIC_LCD */ #endif /* CONFIG_FB_ATY_GENERIC_LCD */
} }
...@@ -2597,8 +2601,8 @@ static int aty_init(struct fb_info *info) ...@@ -2597,8 +2601,8 @@ static int aty_init(struct fb_info *info)
aty_ld_le32(DSP_ON_OFF, par), aty_ld_le32(DSP_ON_OFF, par),
aty_ld_le32(CLOCK_CNTL, par)); aty_ld_le32(CLOCK_CNTL, par));
for (i = 0; i < 40; i++) for (i = 0; i < 40; i++)
printk(" %02x", aty_ld_pll_ct(i, par)); pr_cont(" %02x", aty_ld_pll_ct(i, par));
printk("\n"); pr_cont("\n");
} }
#endif #endif
if (par->pll_ops->init_pll) if (par->pll_ops->init_pll)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment