From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bartlomiej Zolnierkiewicz Date: Thu, 20 Dec 2018 16:31:57 +0000 Subject: Re: [PATCH v3] fbcon: Silence fbcon logo on 'quiet' boots Message-Id: <3de54c0d-3e9b-769f-5cc6-e69dbb399426@samsung.com> List-Id: References: <20181030154419.2889-1-prarit@redhat.com> In-Reply-To: <20181030154419.2889-1-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 , Daniel Vetter , Steven Rostedt , Marko Myllynen , Hans de Goede , dri-devel@lists.freedesktop.org, Thierry Reding [ added Petr & Sergey to Cc: ] Hi, On 10/30/2018 04:44 PM, Prarit Bhargava wrote: > 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 > > Signed-off-by: Prarit Bhargava > Cc: Hans de Goede > Cc: Marko Myllynen > Cc: Steven Rostedt (VMware) > Cc: Bartlomiej Zolnierkiewicz > Cc: Kees Cook > Cc: Daniel Vetter > Cc: Thierry Reding > Cc: Yisheng Xie > Cc: dri-devel@lists.freedesktop.org > --- > drivers/video/fbdev/core/fbcon.c | 13 ++++++++----- > kernel/printk/printk.c | 1 + > 2 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c > index 8958ccc8b1ac..08e092eaf45c 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; > } > @@ -1051,7 +1054,7 @@ static void fbcon_init(struct vc_data *vc, int init) > struct vc_data **default_mode = vc->vc_display_fg; > struct vc_data *svc = *default_mode; > struct display *t, *p = &fb_display[vc->vc_num]; > - int logo = 1, new_rows, new_cols, rows, cols, charcnt = 256; > + int new_rows, new_cols, rows, cols, charcnt = 256; > int cap, ret; > > if (info_idx = -1 || info = NULL) > @@ -1059,9 +1062,9 @@ static void fbcon_init(struct vc_data *vc, int init) > > cap = info->flags; > > - if (vc != svc || logo_shown = FBCON_LOGO_DONTSHOW || > + if (vc != svc || console_loglevel <= CONSOLE_LOGLEVEL_QUIET || > (info->fix.type = FB_TYPE_TEXT)) > - logo = 0; > + logo_shown = FBCON_LOGO_DONTSHOW; "logo" variable removal is an unrelated change which actually changes the code behavior ("logo_shown" will be now modified also for "vc != svc" and "info->fix.type = FB_TYPE_TEXT" cases). Please either drop it or explain in the patch description why it is a safe thing to do. > if (var_to_display(p, &info->var, info)) > return; > @@ -1176,7 +1179,7 @@ static void fbcon_init(struct vc_data *vc, int init) > } else > vc_resize(vc, new_cols, new_rows); > > - if (logo) > + if (logo_shown != FBCON_LOGO_DONTSHOW) > fbcon_prepare_logo(vc, info, cols, rows, new_cols, new_rows); > > if (vc = svc && softback_buf) > diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c > index b77150ad1965..391e390feac9 100644 > --- a/kernel/printk/printk.c > +++ b/kernel/printk/printk.c > @@ -66,6 +66,7 @@ int console_printk[4] = { > CONSOLE_LOGLEVEL_MIN, /* minimum_console_loglevel */ > CONSOLE_LOGLEVEL_DEFAULT, /* default_console_loglevel */ > }; > +EXPORT_SYMBOL(console_printk); You need printk Maintainers Ack on it. > atomic_t ignore_console_lock_warning __read_mostly = ATOMIC_INIT(0); > EXPORT_SYMBOL(ignore_console_lock_warning); Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bartlomiej Zolnierkiewicz Subject: Re: [PATCH v3] fbcon: Silence fbcon logo on 'quiet' boots Date: Thu, 20 Dec 2018 17:31:57 +0100 Message-ID: <3de54c0d-3e9b-769f-5cc6-e69dbb399426@samsung.com> References: <20181030154419.2889-1-prarit@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by gabe.freedesktop.org (Postfix) with ESMTPS id C42E16F42C for ; Thu, 20 Dec 2018 16:32:02 +0000 (UTC) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20181220163201euoutp0283b9411f910ddcd249fff11af4c7ddf2~yF44aMMfA0246002460euoutp02C for ; Thu, 20 Dec 2018 16:32:01 +0000 (GMT) In-Reply-To: <20181030154419.2889-1-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 , Daniel Vetter , Steven Rostedt , Marko Myllynen , Hans de Goede , dri-devel@lists.freedesktop.org, Thierry Reding List-Id: dri-devel@lists.freedesktop.org ClsgYWRkZWQgUGV0ciAmIFNlcmdleSB0byBDYzogXQoKSGksCgpPbiAxMC8zMC8yMDE4IDA0OjQ0 IFBNLCBQcmFyaXQgQmhhcmdhdmEgd3JvdGU6Cj4gT24gdGV4dC1iYXNlZCBzeXN0ZW1zIHRoZSAn cXVpZXQnIGJvb3Qgb3B0aW9uIHdpbGwgc2hvdyBwcmludGsgbGV2ZWxzCj4gaGlnaGVyIHRoYW4g Q09OU09MRV9MT0dMRVZFTF9RVUlFVC4gIFRoZSBkaXNwbGF5aW5nIG9mIHRoZSBUdXggbG9nbwo+ IGR1cmluZyBib290IGNhbiBjYXVzZSBzb21lIGNvbnNvbGVzIHRvIGxvc2UgZGlzcGxheSBkYXRh IGFuZCBhcyBhIHJlc3VsdAo+IGNvbmZ1c2UgdGhlIGVuZCB1c2VyLgo+IAo+IERvIG5vdCBkaXNw bGF5IHRoZSBUdXggbG9nbyBvbiBzeXN0ZW1zIHRoYXQgYXJlIGluICdxdWlldCcgYm9vdC4KPiAK PiB2MjogSXQgaGVscHMgdG8gY29tbWl0IGFsbCBteSBjaGFuZ2VzIGJlZm9yZSBzZW5kaW5nIHRo ZW0uICBSZW1vdmUgZXh0cmEKPiBicmFja2V0Lgo+IHYzOiBidWlsZGJvdCBlcnJvciBmaXg6IGZi Y29uIGNhbiBiZSBidWlsdCBhcyBwYXJ0IG9mIGEgbW9kdWxlIHNvIGV4cG9ydCBjb25zb2xlX3By aW50awo+IAo+IFNpZ25lZC1vZmYtYnk6IFByYXJpdCBCaGFyZ2F2YSA8cHJhcml0QHJlZGhhdC5j b20+Cj4gQ2M6IEhhbnMgZGUgR29lZGUgPGhkZWdvZWRlQHJlZGhhdC5jb20+Cj4gQ2M6IE1hcmtv IE15bGx5bmVuIDxteWxseW5lbkByZWRoYXQuY29tPgo+IENjOiBTdGV2ZW4gUm9zdGVkdCAoVk13 YXJlKSA8cm9zdGVkdEBnb29kbWlzLm9yZz4KPiBDYzogQmFydGxvbWllaiBab2xuaWVya2lld2lj eiA8Yi56b2xuaWVya2llQHNhbXN1bmcuY29tPgo+IENjOiBLZWVzIENvb2sgPGtlZXNjb29rQGNo cm9taXVtLm9yZz4KPiBDYzogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4K PiBDYzogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KPiBDYzogWWlzaGVuZyBY aWUgPHlzeGllQGZveG1haWwuY29tPgo+IENjOiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCj4gLS0tCj4gIGRyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYmNvbi5jIHwgMTMgKysrKysr KystLS0tLQo+ICBrZXJuZWwvcHJpbnRrL3ByaW50ay5jICAgICAgICAgICB8ICAxICsKPiAgMiBm aWxlcyBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAt LWdpdCBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYmNvbi5jIGIvZHJpdmVycy92aWRlby9m YmRldi9jb3JlL2ZiY29uLmMKPiBpbmRleCA4OTU4Y2NjOGIxYWMuLjA4ZTA5MmVhZjQ1YyAxMDA2 NDQKPiAtLS0gYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJjb24uYwo+ICsrKyBiL2RyaXZl cnMvdmlkZW8vZmJkZXYvY29yZS9mYmNvbi5jCj4gQEAgLTY0OSwxMSArNjQ5LDE0IEBAIHN0YXRp YyB2b2lkIGZiY29uX3ByZXBhcmVfbG9nbyhzdHJ1Y3QgdmNfZGF0YSAqdmMsIHN0cnVjdCBmYl9p bmZvICppbmZvLAo+ICAJCWtmcmVlKHNhdmUpOwo+ICAJfQo+ICAKPiArCWlmIChsb2dvX3Nob3du ID09IEZCQ09OX0xPR09fRE9OVFNIT1cpCj4gKwkJcmV0dXJuOwo+ICsKPiAgCWlmIChsb2dvX2xp bmVzID4gdmMtPnZjX2JvdHRvbSkgewo+ICAJCWxvZ29fc2hvd24gPSBGQkNPTl9MT0dPX0NBTlNI T1c7Cj4gIAkJcHJpbnRrKEtFUk5fSU5GTwo+ICAJCSAgICAgICAiZmJjb25faW5pdDogZGlzYWJs ZSBib290LWxvZ28gKGJvb3QtbG9nbyBiaWdnZXIgdGhhbiBzY3JlZW4pLlxuIik7Cj4gLQl9IGVs c2UgaWYgKGxvZ29fc2hvd24gIT0gRkJDT05fTE9HT19ET05UU0hPVykgewo+ICsJfSBlbHNlIHsK PiAgCQlsb2dvX3Nob3duID0gRkJDT05fTE9HT19EUkFXOwo+ICAJCXZjLT52Y190b3AgPSBsb2dv X2xpbmVzOwo+ICAJfQo+IEBAIC0xMDUxLDcgKzEwNTQsNyBAQCBzdGF0aWMgdm9pZCBmYmNvbl9p bml0KHN0cnVjdCB2Y19kYXRhICp2YywgaW50IGluaXQpCj4gIAlzdHJ1Y3QgdmNfZGF0YSAqKmRl ZmF1bHRfbW9kZSA9IHZjLT52Y19kaXNwbGF5X2ZnOwo+ICAJc3RydWN0IHZjX2RhdGEgKnN2YyA9 ICpkZWZhdWx0X21vZGU7Cj4gIAlzdHJ1Y3QgZGlzcGxheSAqdCwgKnAgPSAmZmJfZGlzcGxheVt2 Yy0+dmNfbnVtXTsKPiAtCWludCBsb2dvID0gMSwgbmV3X3Jvd3MsIG5ld19jb2xzLCByb3dzLCBj b2xzLCBjaGFyY250ID0gMjU2Owo+ICsJaW50IG5ld19yb3dzLCBuZXdfY29scywgcm93cywgY29s cywgY2hhcmNudCA9IDI1NjsKPiAgCWludCBjYXAsIHJldDsKPiAgCj4gIAlpZiAoaW5mb19pZHgg PT0gLTEgfHwgaW5mbyA9PSBOVUxMKQo+IEBAIC0xMDU5LDkgKzEwNjIsOSBAQCBzdGF0aWMgdm9p ZCBmYmNvbl9pbml0KHN0cnVjdCB2Y19kYXRhICp2YywgaW50IGluaXQpCj4gIAo+ICAJY2FwID0g aW5mby0+ZmxhZ3M7Cj4gIAo+IC0JaWYgKHZjICE9IHN2YyB8fCBsb2dvX3Nob3duID09IEZCQ09O X0xPR09fRE9OVFNIT1cgfHwKPiArCWlmICh2YyAhPSBzdmMgfHwgY29uc29sZV9sb2dsZXZlbCA8 PSBDT05TT0xFX0xPR0xFVkVMX1FVSUVUIHx8Cj4gIAkgICAgKGluZm8tPmZpeC50eXBlID09IEZC X1RZUEVfVEVYVCkpCj4gLQkJbG9nbyA9IDA7Cj4gKwkJbG9nb19zaG93biA9IEZCQ09OX0xPR09f RE9OVFNIT1c7CgoibG9nbyIgdmFyaWFibGUgcmVtb3ZhbCBpcyBhbiB1bnJlbGF0ZWQgY2hhbmdl IHdoaWNoIGFjdHVhbGx5CmNoYW5nZXMgdGhlIGNvZGUgYmVoYXZpb3IgKCJsb2dvX3Nob3duIiB3 aWxsIGJlIG5vdyBtb2RpZmllZAphbHNvIGZvciAidmMgIT0gc3ZjIiBhbmQgImluZm8tPmZpeC50 eXBlID09IEZCX1RZUEVfVEVYVCIgY2FzZXMpLgoKUGxlYXNlIGVpdGhlciBkcm9wIGl0IG9yIGV4 cGxhaW4gaW4gdGhlIHBhdGNoIGRlc2NyaXB0aW9uIHdoeQppdCBpcyBhIHNhZmUgdGhpbmcgdG8g ZG8uCgo+ICAJaWYgKHZhcl90b19kaXNwbGF5KHAsICZpbmZvLT52YXIsIGluZm8pKQo+ICAJCXJl dHVybjsKPiBAQCAtMTE3Niw3ICsxMTc5LDcgQEAgc3RhdGljIHZvaWQgZmJjb25faW5pdChzdHJ1 Y3QgdmNfZGF0YSAqdmMsIGludCBpbml0KQo+ICAJfSBlbHNlCj4gIAkJdmNfcmVzaXplKHZjLCBu ZXdfY29scywgbmV3X3Jvd3MpOwo+ICAKPiAtCWlmIChsb2dvKQo+ICsJaWYgKGxvZ29fc2hvd24g IT0gRkJDT05fTE9HT19ET05UU0hPVykKPiAgCQlmYmNvbl9wcmVwYXJlX2xvZ28odmMsIGluZm8s IGNvbHMsIHJvd3MsIG5ld19jb2xzLCBuZXdfcm93cyk7Cj4gIAo+ICAJaWYgKHZjID09IHN2YyAm JiBzb2Z0YmFja19idWYpCj4gZGlmZiAtLWdpdCBhL2tlcm5lbC9wcmludGsvcHJpbnRrLmMgYi9r ZXJuZWwvcHJpbnRrL3ByaW50ay5jCj4gaW5kZXggYjc3MTUwYWQxOTY1Li4zOTFlMzkwZmVhYzkg MTAwNjQ0Cj4gLS0tIGEva2VybmVsL3ByaW50ay9wcmludGsuYwo+ICsrKyBiL2tlcm5lbC9wcmlu dGsvcHJpbnRrLmMKPiBAQCAtNjYsNiArNjYsNyBAQCBpbnQgY29uc29sZV9wcmludGtbNF0gPSB7 Cj4gIAlDT05TT0xFX0xPR0xFVkVMX01JTiwJCS8qIG1pbmltdW1fY29uc29sZV9sb2dsZXZlbCAq Lwo+ICAJQ09OU09MRV9MT0dMRVZFTF9ERUZBVUxULAkvKiBkZWZhdWx0X2NvbnNvbGVfbG9nbGV2 ZWwgKi8KPiAgfTsKPiArRVhQT1JUX1NZTUJPTChjb25zb2xlX3ByaW50ayk7CgpZb3UgbmVlZCBw cmludGsgTWFpbnRhaW5lcnMgQWNrIG9uIGl0LgoKPiAgYXRvbWljX3QgaWdub3JlX2NvbnNvbGVf bG9ja193YXJuaW5nIF9fcmVhZF9tb3N0bHkgPSBBVE9NSUNfSU5JVCgwKTsKPiAgRVhQT1JUX1NZ TUJPTChpZ25vcmVfY29uc29sZV9sb2NrX3dhcm5pbmcpOwoKQmVzdCByZWdhcmRzLAotLQpCYXJ0 bG9taWVqIFpvbG5pZXJraWV3aWN6ClNhbXN1bmcgUiZEIEluc3RpdHV0ZSBQb2xhbmQKU2Ftc3Vu ZyBFbGVjdHJvbmljcwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2 ZWwK