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
>
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
