2013-12-17 16:16:02 +00:00
|
|
|
Bugzilla: N/A
|
|
|
|
|
Upstream-status: Fedora mustard
|
|
|
|
|
|
2010-07-29 23:46:31 +00:00
|
|
|
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
|
|
|
|
|
index 1657b96..4c5c2be 100644
|
|
|
|
|
--- a/drivers/video/console/fbcon.c
|
|
|
|
|
+++ b/drivers/video/console/fbcon.c
|
|
|
|
|
@@ -631,13 +631,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
|
|
|
|
|
kfree(save);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- if (logo_lines > vc->vc_bottom) {
|
|
|
|
|
- logo_shown = FBCON_LOGO_CANSHOW;
|
|
|
|
|
- printk(KERN_INFO
|
|
|
|
|
- "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
|
|
|
|
|
- } else if (logo_shown != FBCON_LOGO_DONTSHOW) {
|
|
|
|
|
- logo_shown = FBCON_LOGO_DRAW;
|
|
|
|
|
- vc->vc_top = logo_lines;
|
|
|
|
|
+ if (logo_shown != FBCON_LOGO_DONTSHOW) {
|
|
|
|
|
+ if (logo_lines > vc->vc_bottom) {
|
|
|
|
|
+ logo_shown = FBCON_LOGO_CANSHOW;
|
|
|
|
|
+ printk(KERN_INFO
|
|
|
|
|
+ "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
|
|
|
|
|
+ } else {
|
|
|
|
|
+ logo_shown = FBCON_LOGO_DRAW;
|
|
|
|
|
+ vc->vc_top = logo_lines;
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif /* MODULE */
|
|
|
|
|
@@ -3489,6 +3491,14 @@ static int __init fb_console_init(void)
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+static int __init quiet_logo(char *str)
|
|
|
|
|
+{
|
|
|
|
|
+ logo_shown = FBCON_LOGO_DONTSHOW;
|
|
|
|
|
+ return 0;
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
+early_param("quiet", quiet_logo);
|
|
|
|
|
+
|
|
|
|
|
module_init(fb_console_init);
|
|
|
|
|
|
|
|
|
|
#ifdef MODULE
|
