summaryrefslogtreecommitdiffstats
path: root/silence-fbcon-logo.patch
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2013-01-10 14:24:41 -0500
committerDave Jones <davej@redhat.com>2013-01-10 14:24:41 -0500
commitefd70b8f77b7a7adf3add772e424ce95f289b50e (patch)
tree9a1ef645e505365b98c15b27c8b0f6fd27146a66 /silence-fbcon-logo.patch
parent1cdf6c9bdd28cb65fa59d2b2ce305cac30decd0d (diff)
downloadkernel-efd70b8f77b7a7adf3add772e424ce95f289b50e.tar.gz
kernel-efd70b8f77b7a7adf3add772e424ce95f289b50e.tar.xz
kernel-efd70b8f77b7a7adf3add772e424ce95f289b50e.zip
Rename a bunch of patches.
Diffstat (limited to 'silence-fbcon-logo.patch')
-rw-r--r--silence-fbcon-logo.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/silence-fbcon-logo.patch b/silence-fbcon-logo.patch
new file mode 100644
index 000000000..45ab73331
--- /dev/null
+++ b/silence-fbcon-logo.patch
@@ -0,0 +1,42 @@
+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