From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergey Senozhatsky Date: Fri, 11 Jan 2019 06:04:32 +0000 Subject: Re: [PATCH v4 1/2] fbcon: Silence fbcon logo on 'quiet' boots Message-Id: <20190111060432.GB5766@jagdpanzerIV> List-Id: References: <20181030154419.2889-1-prarit@redhat.com> <20190110190325.15241-1-prarit@redhat.com> <20190110190325.15241-2-prarit@redhat.com> In-Reply-To: <20190110190325.15241-2-prarit@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Prarit Bhargava Cc: Yisheng Xie , linux-fbdev@vger.kernel.org, Sergey Senozhatsky , Kees Cook , Petr Mladek , Bartlomiej Zolnierkiewicz , Daniel Vetter , Steven Rostedt , Marko Myllynen , Hans de Goede , dri-devel@lists.freedesktop.org, Thierry Reding 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 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergey Senozhatsky Subject: Re: [PATCH v4 1/2] fbcon: Silence fbcon logo on 'quiet' boots Date: Fri, 11 Jan 2019 15:04:32 +0900 Message-ID: <20190111060432.GB5766@jagdpanzerIV> References: <20181030154419.2889-1-prarit@redhat.com> <20190110190325.15241-1-prarit@redhat.com> <20190110190325.15241-2-prarit@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1BA7B6E10D for ; Fri, 11 Jan 2019 06:04:38 +0000 (UTC) Received: by mail-pl1-x642.google.com with SMTP id u6so6279899plm.8 for ; Thu, 10 Jan 2019 22:04:38 -0800 (PST) Content-Disposition: inline In-Reply-To: <20190110190325.15241-2-prarit@redhat.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Prarit Bhargava Cc: Yisheng Xie , linux-fbdev@vger.kernel.org, Sergey Senozhatsky , Kees Cook , Petr Mladek , Bartlomiej Zolnierkiewicz , Daniel Vetter , Steven Rostedt , Marko Myllynen , Hans de Goede , dri-devel@lists.freedesktop.org, Thierry Reding List-Id: dri-devel@lists.freedesktop.org T24gKDAxLzEwLzE5IDE0OjAzKSwgUHJhcml0IEJoYXJnYXZhIHdyb3RlOgo+ICsrKyBiL2RyaXZl cnMvdmlkZW8vZmJkZXYvY29yZS9mYmNvbi5jCj4gQEAgLTY0OSwxMSArNjQ5LDE0IEBAIHN0YXRp YyB2b2lkIGZiY29uX3ByZXBhcmVfbG9nbyhzdHJ1Y3QgdmNfZGF0YSAqdmMsIHN0cnVjdCBmYl9p bmZvICppbmZvLAo+ICAJCWtmcmVlKHNhdmUpOwo+ICAJfQo+ICAKPiArCWlmIChsb2dvX3Nob3du ID09IEZCQ09OX0xPR09fRE9OVFNIT1cpCj4gKwkJcmV0dXJuOwoKKwlpZiAoY29uc29sZV9sb2ds ZXZlbCA8PSBDT05TT0xFX0xPR0xFVkVMX1FVSUVUKQorCQlyZXR1cm47CgpXb3VsZCB0aGlzIHR3 by1saW5lciBkbyB0aGUgdHJpY2s/CgoJLXNzCgo+ICsKPiAgCWlmIChsb2dvX2xpbmVzID4gdmMt PnZjX2JvdHRvbSkgewo+ICAJCWxvZ29fc2hvd24gPSBGQkNPTl9MT0dPX0NBTlNIT1c7Cj4gIAkJ cHJpbnRrKEtFUk5fSU5GTwo+ICAJCSAgICAgICAiZmJjb25faW5pdDogZGlzYWJsZSBib290LWxv Z28gKGJvb3QtbG9nbyBiaWdnZXIgdGhhbiBzY3JlZW4pLlxuIik7Cj4gLQl9IGVsc2UgaWYgKGxv Z29fc2hvd24gIT0gRkJDT05fTE9HT19ET05UU0hPVykgewo+ICsJfSBlbHNlIHsKPiAgCQlsb2dv X3Nob3duID0gRkJDT05fTE9HT19EUkFXOwo+ICAJCXZjLT52Y190b3AgPSBsb2dvX2xpbmVzOwo+ ICAJfQo+IEBAIC0xMDU5LDkgKzEwNjIsMTEgQEAgc3RhdGljIHZvaWQgZmJjb25faW5pdChzdHJ1 Y3QgdmNfZGF0YSAqdmMsIGludCBpbml0KQo+ICAKPiAgCWNhcCA9IGluZm8tPmZsYWdzOwo+ICAK PiAtCWlmICh2YyAhPSBzdmMgfHwgbG9nb19zaG93biA9PSBGQkNPTl9MT0dPX0RPTlRTSE9XIHx8 Cj4gLQkgICAgKGluZm8tPmZpeC50eXBlID09IEZCX1RZUEVfVEVYVCkpCj4gKwlpZiAodmMgIT0g c3ZjIHx8IGNvbnNvbGVfbG9nbGV2ZWwgPD0gQ09OU09MRV9MT0dMRVZFTF9RVUlFVCB8fAo+ICsJ ICAgIChpbmZvLT5maXgudHlwZSA9PSBGQl9UWVBFX1RFWFQpKSB7Cj4gIAkJbG9nbyA9IDA7Cj4g KwkJbG9nb19zaG93biA9IEZCQ09OX0xPR09fRE9OVFNIT1c7Cj4gKwl9Cj4gIAo+ICAJaWYgKHZh cl90b19kaXNwbGF5KHAsICZpbmZvLT52YXIsIGluZm8pKQo+ICAJCXJldHVybjsKPiAtLSAKPiAy LjE3LjIKPiAKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18K ZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==