ignatenkobrain / rpms / kernel

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