aboutsummaryrefslogtreecommitdiffstats
path: root/xen/drivers
diff options
context:
space:
mode:
authorJulien Grall <julien.grall@linaro.org>2013-09-13 13:49:17 +0100
committerIan Campbell <ian.campbell@citrix.com>2013-09-17 15:28:13 +0100
commit34743911e7a49f424fc2e92b5148e411aae8e71c (patch)
treedcd19331e33bafb16f54cf07916319255c871bc9 /xen/drivers
parent2004c038ea3617a9cc0132f6636d953616ac77f8 (diff)
downloadxen-34743911e7a49f424fc2e92b5148e411aae8e71c.tar.gz
xen-34743911e7a49f424fc2e92b5148e411aae8e71c.tar.bz2
xen-34743911e7a49f424fc2e92b5148e411aae8e71c.zip
xen/video: hdlcd: Use early_printk instead of printk
The video driver is initialized before the console is correctly set up. Therefore, printk will never output if there is no serial configured. Signed-off-by: Julien Grall <julien.grall@linaro.org> Acked-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'xen/drivers')
-rw-r--r--xen/drivers/video/arm_hdlcd.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/xen/drivers/video/arm_hdlcd.c b/xen/drivers/video/arm_hdlcd.c
index ab464c644f..dffda9aca1 100644
--- a/xen/drivers/video/arm_hdlcd.c
+++ b/xen/drivers/video/arm_hdlcd.c
@@ -146,13 +146,13 @@ void __init video_init(void)
if ( !hdlcd_start )
{
- printk(KERN_ERR "HDLCD address missing from device tree, disabling driver\n");
+ early_printk(KERN_ERR "HDLCD: address missing from device tree, disabling driver\n");
return;
}
if ( !hdlcd_start || !framebuffer_start )
{
- printk(KERN_ERR "HDLCD: framebuffer address missing from device tree, disabling driver\n");
+ early_printk(KERN_ERR "HDLCD: framebuffer address missing from device tree, disabling driver\n");
return;
}
@@ -166,27 +166,27 @@ void __init video_init(void)
else if ( strlen(mode_string) < strlen("800x600@60") ||
strlen(mode_string) > sizeof(_mode_string) - 1 )
{
- printk(KERN_ERR "HDLCD: invalid modeline=%s\n", mode_string);
+ early_printk(KERN_ERR "HDLCD: invalid modeline=%s\n", mode_string);
return;
} else {
char *s = strchr(mode_string, '-');
if ( !s )
{
- printk(KERN_INFO "HDLCD: bpp not found in modeline %s, assume 32 bpp\n",
- mode_string);
+ early_printk(KERN_INFO "HDLCD: bpp not found in modeline %s, assume 32 bpp\n",
+ mode_string);
get_color_masks("32", &c);
memcpy(_mode_string, mode_string, strlen(mode_string) + 1);
bytes_per_pixel = 4;
} else {
if ( strlen(s) < 6 )
{
- printk(KERN_ERR "HDLCD: invalid mode %s\n", mode_string);
+ early_printk(KERN_ERR "HDLCD: invalid mode %s\n", mode_string);
return;
}
s++;
if ( get_color_masks(s, &c) < 0 )
{
- printk(KERN_WARNING "HDLCD: unsupported bpp %s\n", s);
+ early_printk(KERN_WARNING "HDLCD: unsupported bpp %s\n", s);
return;
}
bytes_per_pixel = simple_strtoll(s, NULL, 10) / 8;
@@ -205,22 +205,23 @@ void __init video_init(void)
}
if ( !videomode )
{
- printk(KERN_WARNING "HDLCD: unsupported videomode %s\n", _mode_string);
+ early_printk(KERN_WARNING "HDLCD: unsupported videomode %s\n",
+ _mode_string);
return;
}
if ( framebuffer_size < bytes_per_pixel * videomode->xres * videomode->yres )
{
- printk(KERN_ERR "HDLCD: the framebuffer is too small, disabling the HDLCD driver\n");
+ early_printk(KERN_ERR "HDLCD: the framebuffer is too small, disabling the HDLCD driver\n");
return;
}
- printk(KERN_INFO "Initializing HDLCD driver\n");
+ early_printk(KERN_INFO "Initializing HDLCD driver\n");
lfb = ioremap_wc(framebuffer_start, framebuffer_size);
if ( !lfb )
{
- printk(KERN_ERR "Couldn't map the framebuffer\n");
+ early_printk(KERN_ERR "Couldn't map the framebuffer\n");
return;
}
memset(lfb, 0x00, bytes_per_pixel * videomode->xres * videomode->yres);