Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fbcon: Silence fbcon logo on 'quiet' boots

On text-based systems the 'quiet' boot option will show printk levels
higher than CONSOLE_LOGLEVEL_QUIET. The displaying of the Tux logo
during boot can cause some consoles to lose display data and as a result
confuse the end user.

Do not display the Tux logo on systems that are in 'quiet' boot.

v2: It helps to commit all my changes before sending them. Remove extra
bracket.
v3: buildbot error fix: fbcon can be built as part of a module so export console_printk
v4: move console_printk change to separate patch, and drop logo cleanup
v5: Only set FBCON_LOGO_DONTSHOW for console loglevel

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Marko Myllynen <myllynen@redhat.com>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Thierry Reding <treding@nvidia.com>
Cc: Yisheng Xie <ysxie@foxmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>

authored by

Prarit Bhargava and committed by
Bartlomiej Zolnierkiewicz
10993504 a1939185

+7 -1
+7 -1
drivers/video/fbdev/core/fbcon.c
··· 656 656 kfree(save); 657 657 } 658 658 659 + if (logo_shown == FBCON_LOGO_DONTSHOW) 660 + return; 661 + 659 662 if (logo_lines > vc->vc_bottom) { 660 663 logo_shown = FBCON_LOGO_CANSHOW; 661 664 printk(KERN_INFO 662 665 "fbcon_init: disable boot-logo (boot-logo bigger than screen).\n"); 663 - } else if (logo_shown != FBCON_LOGO_DONTSHOW) { 666 + } else { 664 667 logo_shown = FBCON_LOGO_DRAW; 665 668 vc->vc_top = logo_lines; 666 669 } ··· 1068 1065 return; 1069 1066 1070 1067 cap = info->flags; 1068 + 1069 + if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET) 1070 + logo_shown = FBCON_LOGO_DONTSHOW; 1071 1071 1072 1072 if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW || 1073 1073 (info->fix.type == FB_TYPE_TEXT))