|
|
6a91557 |
From: "kernel-team@fedoraproject.org" <kernel-team@fedoraproject.org>
|
|
|
6a91557 |
Date: Thu, 29 Jul 2010 16:46:31 -0700
|
|
|
6a91557 |
Subject: [PATCH] silence fbcon logo
|
|
|
6a91557 |
|
|
|
68d0d67 |
Bugzilla: N/A
|
|
|
68d0d67 |
Upstream-status: Fedora mustard
|
|
|
6a91557 |
---
|
|
|
6a91557 |
drivers/video/console/fbcon.c | 24 +++++++++++++++++-------
|
|
|
6a91557 |
1 file changed, 17 insertions(+), 7 deletions(-)
|
|
|
68d0d67 |
|
|
Jesse Keating |
7a32965 |
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
|
|
|
76c11d9 |
index 658c34bb9076..25ab00980e4c 100644
|
|
Jesse Keating |
7a32965 |
--- a/drivers/video/console/fbcon.c
|
|
Jesse Keating |
7a32965 |
+++ b/drivers/video/console/fbcon.c
|
|
|
a281db6 |
@@ -634,13 +634,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
|
|
Jesse Keating |
7a32965 |
kfree(save);
|
|
Jesse Keating |
7a32965 |
}
|
|
Jesse Keating |
7a32965 |
|
|
Jesse Keating |
7a32965 |
- if (logo_lines > vc->vc_bottom) {
|
|
Jesse Keating |
7a32965 |
- logo_shown = FBCON_LOGO_CANSHOW;
|
|
Jesse Keating |
7a32965 |
- printk(KERN_INFO
|
|
Jesse Keating |
7a32965 |
- "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
|
|
Jesse Keating |
7a32965 |
- } else if (logo_shown != FBCON_LOGO_DONTSHOW) {
|
|
Jesse Keating |
7a32965 |
- logo_shown = FBCON_LOGO_DRAW;
|
|
Jesse Keating |
7a32965 |
- vc->vc_top = logo_lines;
|
|
Jesse Keating |
7a32965 |
+ if (logo_shown != FBCON_LOGO_DONTSHOW) {
|
|
Jesse Keating |
7a32965 |
+ if (logo_lines > vc->vc_bottom) {
|
|
Jesse Keating |
7a32965 |
+ logo_shown = FBCON_LOGO_CANSHOW;
|
|
Jesse Keating |
7a32965 |
+ printk(KERN_INFO
|
|
Jesse Keating |
7a32965 |
+ "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n");
|
|
Jesse Keating |
7a32965 |
+ } else {
|
|
Jesse Keating |
7a32965 |
+ logo_shown = FBCON_LOGO_DRAW;
|
|
Jesse Keating |
7a32965 |
+ vc->vc_top = logo_lines;
|
|
Jesse Keating |
7a32965 |
+ }
|
|
Jesse Keating |
7a32965 |
}
|
|
Jesse Keating |
7a32965 |
}
|
|
Jesse Keating |
7a32965 |
#endif /* MODULE */
|
|
|
76c11d9 |
@@ -3621,6 +3623,14 @@ static int __init fb_console_init(void)
|
|
Jesse Keating |
7a32965 |
return 0;
|
|
Jesse Keating |
7a32965 |
}
|
|
Jesse Keating |
7a32965 |
|
|
Jesse Keating |
7a32965 |
+static int __init quiet_logo(char *str)
|
|
Jesse Keating |
7a32965 |
+{
|
|
Jesse Keating |
7a32965 |
+ logo_shown = FBCON_LOGO_DONTSHOW;
|
|
Jesse Keating |
7a32965 |
+ return 0;
|
|
Jesse Keating |
7a32965 |
+}
|
|
Jesse Keating |
7a32965 |
+
|
|
Jesse Keating |
7a32965 |
+early_param("quiet", quiet_logo);
|
|
Jesse Keating |
7a32965 |
+
|
|
|
208228c |
fs_initcall(fb_console_init);
|
|
Jesse Keating |
7a32965 |
|
|
Jesse Keating |
7a32965 |
#ifdef MODULE
|