queue-5.1/fbcon-don-t-reset-logo_shown-when-logo-is-currently-.patch

   1 From 7f3243f98f7cad2b47f5dac9f37bf17fb9057418 Mon Sep 17 00:00:00 2001
   2 From: Andreas Schwab <schwab@linux-m68k.org>
   3 Date: Mon, 6 May 2019 15:57:47 +0200
   4 Subject: fbcon: Don't reset logo_shown when logo is currently shown
   5
   6 [ Upstream commit 3c5a1b111373e669c8220803464c3a508a87e254 ]
   7
   8 When the logo is currently drawn on a virtual console, and the console
   9 loglevel is reduced to quiet, logo_shown must be left alone, so that it
  10 the scrolling region on that virtual console is properly reset.
  11
  12 Fixes: 10993504d647 ("fbcon: Silence fbcon logo on 'quiet' boots")
  13 Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
  14 Cc: Prarit Bhargava <prarit@redhat.com>
  15 Cc: Yisheng Xie <ysxie@foxmail.com>
  16 Cc: Kees Cook <keescook@chromium.org>
  17 Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
  18 Cc: Steven Rostedt <rostedt@goodmis.org>
  19 Cc: Marko Myllynen <myllynen@redhat.com>
  20 Cc: Hans de Goede <hdegoede@redhat.com>
  21 Cc: Thierry Reding <treding@nvidia.com>
  22 Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  23 Signed-off-by: Sasha Levin <sashal@kernel.org>
  24 ---
  25  drivers/video/fbdev/core/fbcon.c | 2 +-
  26  1 file changed, 1 insertion(+), 1 deletion(-)
  27
  28 diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
  29 index c59b23f6e9ba..a9c69ae30878 100644
  30 --- a/drivers/video/fbdev/core/fbcon.c
  31 +++ b/drivers/video/fbdev/core/fbcon.c
  32 @@ -1069,7 +1069,7 @@ static void fbcon_init(struct vc_data *vc, int init)
  33
  34         cap = info->flags;
  35
  36 -       if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
  37 +       if (logo_shown < 0 && console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
  38                 logo_shown = FBCON_LOGO_DONTSHOW;
  39
  40         if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW ||
  41 --
  42 2.20.1
  43