From 6aaaa535ba448abe2c770fdb09b66d66fa72ea3a Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 6 May 2019 15:57:47 +0200 Subject: fbcon: Don't reset logo_shown when logo is currently shown [ Upstream commit 3c5a1b111373e669c8220803464c3a508a87e254 ] When the logo is currently drawn on a virtual console, and the console loglevel is reduced to quiet, logo_shown must be left alone, so that it the scrolling region on that virtual console is properly reset. Fixes: 10993504d647 ("fbcon: Silence fbcon logo on 'quiet' boots") Signed-off-by: Andreas Schwab Cc: Prarit Bhargava Cc: Yisheng Xie Cc: Kees Cook Cc: Daniel Vetter Cc: Steven Rostedt Cc: Marko Myllynen Cc: Hans de Goede Cc: Thierry Reding Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin --- drivers/video/fbdev/core/fbcon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index c59b23f6e9ba..a9c69ae30878 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -1069,7 +1069,7 @@ static void fbcon_init(struct vc_data *vc, int init) cap = info->flags; - if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET) + if (logo_shown < 0 && console_loglevel <= CONSOLE_LOGLEVEL_QUIET) logo_shown = FBCON_LOGO_DONTSHOW; if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW || -- cgit v1.2.3