[PATCH] fbcon: Silence fbcon logo on 'quiet' boots

[Thierry Reding]

On Mon, Oct 29, 2018 at 09:02:32AM -0400, Prarit Bhargava wrote:
> A variant of this patch has been in Fedora since at least 2010 and
> AFAWCT there haven't been any complaints about the change in behavior.
> 
> https://src.fedoraproject.org/cgit/rpms/kernel.git/tree/silence-fbcon-logo.patch
> 
> P.
> 
> ---8<---
> 
> 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.
> 
> Signed-off-by: Prarit Bhargava <prarit at redhat.com>
> Cc: Hans de Goede <hdegoede at redhat.com>
> Cc: Marko Myllynen <myllynen at redhat.com>
> Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie at samsung.com>
> Cc: Kees Cook <keescook at chromium.org>
> Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
> Cc: Thierry Reding <treding at nvidia.com>
> Cc: Yisheng Xie <ysxie at foxmail.com>
> Cc: dri-devel at lists.freedesktop.org
> Cc: Steven Rostedt (VMware) <rostedt at goodmis.org>
> ---
>  drivers/video/fbdev/core/fbcon.c | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
> index 75ebbbf0a1fb..a2f2c7ea11ef 100644
> --- a/drivers/video/fbdev/core/fbcon.c
> +++ b/drivers/video/fbdev/core/fbcon.c
> @@ -650,11 +650,14 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
>  		kfree(save);
>  	}
>  
> +	if (logo_shown == FBCON_LOGO_DONTSHOW) {
> +		return;
> +

You're missing a closing } here (well, you really shouldn't have the
opening { in the first place since this is a single line block.

That's what's causing the warnings from the 0-day builder.

Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/dri-devel/attachments/20181029/aa8e51fa/attachment-0001.sig>