|
 |
f2c60e |
From a8a15723637c6dfbd5042b5c3453d31f5815f044 Mon Sep 17 00:00:00 2001
|
|
|
f2c60e |
From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
|
|
|
f2c60e |
Date: Thu, 29 Jul 2010 16:46:31 -0700
|
|
|
f2c60e |
Subject: [PATCH] silence fbcon logo
|
|
|
f2c60e |
|
|
|
f2c60e |
Bugzilla: N/A
|
|
|
f2c60e |
Upstream-status: Fedora mustard
|
|
|
f2c60e |
---
|
|
|
f2c60e |
drivers/video/fbdev/core/fbcon.c | 26 +++++++++++++++++++-------
|
|
|
f2c60e |
1 file changed, 19 insertions(+), 7 deletions(-)
|
|
|
f2c60e |
|
|
|
f2c60e |
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
|
|
|
f2c60e |
index afd3301ac40c..2e08ba0ade3e 100644
|
|
|
f2c60e |
--- a/drivers/video/fbdev/core/fbcon.c
|
|
|
f2c60e |
+++ b/drivers/video/fbdev/core/fbcon.c
|
|
|
f2c60e |
@@ -634,13 +634,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
|
|
|
f2c60e |
kfree(save);
|
|
|
f2c60e |
}
|
|
|
f2c60e |
|
|
|
f2c60e |
- if (logo_lines > vc->vc_bottom) {
|
|
|
f2c60e |
- logo_shown = FBCON_LOGO_CANSHOW;
|
|
|
f2c60e |
- printk(KERN_INFO
|
|
|
f2c60e |
- "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
|
|
|
f2c60e |
- } else if (logo_shown != FBCON_LOGO_DONTSHOW) {
|
|
|
f2c60e |
- logo_shown = FBCON_LOGO_DRAW;
|
|
|
f2c60e |
- vc->vc_top = logo_lines;
|
|
|
f2c60e |
+ if (logo_shown != FBCON_LOGO_DONTSHOW) {
|
|
|
f2c60e |
+ if (logo_lines > vc->vc_bottom) {
|
|
|
f2c60e |
+ logo_shown = FBCON_LOGO_CANSHOW;
|
|
|
f2c60e |
+ printk(KERN_INFO
|
|
|
f2c60e |
+ "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
|
|
|
f2c60e |
+ } else {
|
|
|
f2c60e |
+ logo_shown = FBCON_LOGO_DRAW;
|
|
|
f2c60e |
+ vc->vc_top = logo_lines;
|
|
|
f2c60e |
+ }
|
|
|
f2c60e |
}
|
|
|
f2c60e |
}
|
|
|
f2c60e |
#endif /* MODULE */
|
|
|
f2c60e |
@@ -3671,4 +3671,15 @@ void __exit fb_console_exit(void)
|
|
|
f2c60e |
do_unregister_con_driver(&fb_con);
|
|
|
f2c60e |
console_unlock();
|
|
|
f2c60e |
}
|
|
|
f2c60e |
+
|
|
|
f2c60e |
+#else
|
|
|
f2c60e |
+
|
|
|
f2c60e |
+static int __init quiet_logo(char *str)
|
|
|
f2c60e |
+{
|
|
|
f2c60e |
+ logo_shown = FBCON_LOGO_DONTSHOW;
|
|
|
f2c60e |
+ return 0;
|
|
|
f2c60e |
+}
|
|
|
f2c60e |
+
|
|
|
f2c60e |
+early_param("quiet", quiet_logo);
|
|
|
f2c60e |
+
|
|
|
f2c60e |
#endif
|
|
|
f2c60e |
--
|
|
|
f2c60e |
2.7.4
|
|
|
f2c60e |
|