| Message ID | 20190110190325.15241-2-prarit@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Do not output logo on quiet boots | expand |
On (01/10/19 14:03), Prarit Bhargava wrote: > +++ b/drivers/video/fbdev/core/fbcon.c > @@ -649,11 +649,14 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, > kfree(save); > } > > + if (logo_shown == FBCON_LOGO_DONTSHOW) > + return; + if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET) + return; Would this two-liner do the trick? -ss > + > 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) { > + } else { > logo_shown = FBCON_LOGO_DRAW; > vc->vc_top = logo_lines; > } > @@ -1059,9 +1062,11 @@ static void fbcon_init(struct vc_data *vc, int init) > > cap = info->flags; > > - if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW || > - (info->fix.type == FB_TYPE_TEXT)) > + if (vc != svc || console_loglevel <= CONSOLE_LOGLEVEL_QUIET || > + (info->fix.type == FB_TYPE_TEXT)) { > logo = 0; > + logo_shown = FBCON_LOGO_DONTSHOW; > + } > > if (var_to_display(p, &info->var, info)) > return; > -- > 2.17.2 >
On Fri 2019-01-11 15:04:32, Sergey Senozhatsky wrote: > On (01/10/19 14:03), Prarit Bhargava wrote: > > +++ b/drivers/video/fbdev/core/fbcon.c > > @@ -649,11 +649,14 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, > > kfree(save); > > } > > > > + if (logo_shown == FBCON_LOGO_DONTSHOW) > > + return; > > + if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET) > + return; > > Would this two-liner do the trick? But then the other functions, like fbcon_scroll() or fbcon_switch(), would think that the logo was shown because logo_shown != FBCON_LOGO_DONTSHOW. It might be possible to do logo_shown = FBCON_LOGO_DONTSHOW. But I am not sure if it is safe, see below. > -ss > > > + > > 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) { > > + } else { > > logo_shown = FBCON_LOGO_DRAW; > > vc->vc_top = logo_lines; > > } > > @@ -1059,9 +1062,11 @@ static void fbcon_init(struct vc_data *vc, int init) > > > > cap = info->flags; > > > > - if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW || > > - (info->fix.type == FB_TYPE_TEXT)) > > + if (vc != svc || console_loglevel <= CONSOLE_LOGLEVEL_QUIET || > > + (info->fix.type == FB_TYPE_TEXT)) { > > logo = 0; > > + logo_shown = FBCON_LOGO_DONTSHOW; This has still the problem mentioned in the v3 feedback. It modifies the global variable logo_shown even when vc != svc. You still need check and explain why it is safe. It is not clear to me. Best Regards, Petr > > + } > > > > if (var_to_display(p, &info->var, info)) > > return; > > -- > > 2.17.2 > >
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 8976190b6c1f..66e37bdff1d9 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -649,11 +649,14 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, kfree(save); } + if (logo_shown == FBCON_LOGO_DONTSHOW) + return; + 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) { + } else { logo_shown = FBCON_LOGO_DRAW; vc->vc_top = logo_lines; } @@ -1059,9 +1062,11 @@ static void fbcon_init(struct vc_data *vc, int init) cap = info->flags; - if (vc != svc || logo_shown == FBCON_LOGO_DONTSHOW || - (info->fix.type == FB_TYPE_TEXT)) + if (vc != svc || console_loglevel <= CONSOLE_LOGLEVEL_QUIET || + (info->fix.type == FB_TYPE_TEXT)) { logo = 0; + logo_shown = FBCON_LOGO_DONTSHOW; + } if (var_to_display(p, &info->var, info)) return;
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 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: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> 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> Cc: Petr Mladek <pmladek@suse.com> Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: dri-devel@lists.freedesktop.org --- drivers/video/fbdev/core/fbcon.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)