All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
To: Prarit Bhargava <prarit@redhat.com>
Cc: Yisheng Xie <ysxie@foxmail.com>,
	linux-fbdev@vger.kernel.org,
	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
	Kees Cook <keescook@chromium.org>, Petr Mladek <pmladek@suse.com>,
	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Steven Rostedt <rostedt@goodmis.org>,
	Marko Myllynen <myllynen@redhat.com>,
	Hans de Goede <hdegoede@redhat.com>,
	dri-devel@lists.freedesktop.org,
	Thierry Reding <treding@nvidia.com>
Subject: Re: [PATCH v4 1/2] fbcon: Silence fbcon logo on 'quiet' boots
Date: Fri, 11 Jan 2019 06:04:32 +0000	[thread overview]
Message-ID: <20190111060432.GB5766@jagdpanzerIV> (raw)
In-Reply-To: <20190110190325.15241-2-prarit@redhat.com>

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
> 

WARNING: multiple messages have this Message-ID (diff)
From: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
To: Prarit Bhargava <prarit@redhat.com>
Cc: Yisheng Xie <ysxie@foxmail.com>,
	linux-fbdev@vger.kernel.org,
	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
	Kees Cook <keescook@chromium.org>, Petr Mladek <pmladek@suse.com>,
	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Steven Rostedt <rostedt@goodmis.org>,
	Marko Myllynen <myllynen@redhat.com>,
	Hans de Goede <hdegoede@redhat.com>,
	dri-devel@lists.freedesktop.org,
	Thierry Reding <treding@nvidia.com>
Subject: Re: [PATCH v4 1/2] fbcon: Silence fbcon logo on 'quiet' boots
Date: Fri, 11 Jan 2019 15:04:32 +0900	[thread overview]
Message-ID: <20190111060432.GB5766@jagdpanzerIV> (raw)
In-Reply-To: <20190110190325.15241-2-prarit@redhat.com>

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

  reply	other threads:[~2019-01-11  6:04 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20181030154456epcas4p19e91c78daad3f1f48e8260601e5fdfec@epcas4p1.samsung.com>
2018-10-30 15:44 ` [PATCH v3] fbcon: Silence fbcon logo on 'quiet' boots Prarit Bhargava
2018-10-30 15:44   ` Prarit Bhargava
2018-10-30 21:35   ` Steven Rostedt
2018-10-30 21:35     ` Steven Rostedt
2018-10-30 21:35   ` Steven Rostedt
2018-10-30 21:35     ` Steven Rostedt
2018-10-30 22:31     ` Prarit Bhargava
2018-10-30 22:31       ` Prarit Bhargava
2018-12-20 16:31   ` Bartlomiej Zolnierkiewicz
2018-12-20 16:31     ` Bartlomiej Zolnierkiewicz
2019-01-02 16:05     ` Petr Mladek
2019-01-02 16:05       ` Petr Mladek
2019-01-03 10:38       ` Geert Uytterhoeven
2019-01-03 10:38         ` Geert Uytterhoeven
2019-01-10 18:46       ` Prarit Bhargava
2019-01-10 18:46         ` Prarit Bhargava
2019-01-07 10:09     ` Sergey Senozhatsky
2019-01-07 10:09       ` Sergey Senozhatsky
2019-01-10 19:03   ` [PATCH v4 0/2] Do not output logo on quiet boots Prarit Bhargava
2019-01-10 19:03     ` Prarit Bhargava
2019-01-10 19:03     ` [PATCH v4 1/2] fbcon: Silence fbcon logo on 'quiet' boots Prarit Bhargava
2019-01-10 19:03       ` Prarit Bhargava
2019-01-11  6:04       ` Sergey Senozhatsky [this message]
2019-01-11  6:04         ` Sergey Senozhatsky
2019-01-15 15:09         ` Petr Mladek
2019-01-15 15:09           ` Petr Mladek
2019-01-10 19:03     ` [PATCH v4 2/2] printk: Export console_printk Prarit Bhargava
2019-01-10 19:03       ` Prarit Bhargava
2019-01-11  6:02       ` Sergey Senozhatsky
2019-01-11  6:02         ` Sergey Senozhatsky

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190111060432.GB5766@jagdpanzerIV \
    --to=sergey.senozhatsky.work@gmail.com \
    --cc=b.zolnierkie@samsung.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=hdegoede@redhat.com \
    --cc=keescook@chromium.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=myllynen@redhat.com \
    --cc=pmladek@suse.com \
    --cc=prarit@redhat.com \
    --cc=rostedt@goodmis.org \
    --cc=sergey.senozhatsky@gmail.com \
    --cc=treding@nvidia.com \
    --cc=ysxie@foxmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.