From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Rostedt Date: Tue, 30 Oct 2018 21:35:57 +0000 Subject: Re: [PATCH v3] fbcon: Silence fbcon logo on 'quiet' boots Message-Id: <7E403552-A66C-473E-A00E-C67E5316D2DA@goodmis.org> 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 , linux-fbdev@vger.kernel.org Cc: Yisheng Xie , Kees Cook , Bartlomiej Zolnierkiewicz , Daniel Vetter , dri-devel@lists.freedesktop.org, Marko Myllynen , Hans de Goede , Thierry Reding I guess you we not very productive with that first patch ;-) -- Steve On October 30, 2018 5:44:19 PM GMT+02:00, 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; > > 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); > > atomic_t ignore_console_lock_warning __read_mostly = ATOMIC_INIT(0); > EXPORT_SYMBOL(ignore_console_lock_warning); -- Sent from my Android device with K-9 Mail. Please excuse my brevity and top posting. From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Rostedt Subject: Re: [PATCH v3] fbcon: Silence fbcon logo on 'quiet' boots Date: Tue, 30 Oct 2018 23:35:57 +0200 Message-ID: <7E403552-A66C-473E-A00E-C67E5316D2DA@goodmis.org> 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 smtprelay.hostedemail.com (smtprelay0097.hostedemail.com [216.40.44.97]) by gabe.freedesktop.org (Postfix) with ESMTPS id 593A66E1A3 for ; Tue, 30 Oct 2018 21:43:21 +0000 (UTC) Received: from smtprelay.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by smtpgrave02.hostedemail.com (Postfix) with ESMTP id EB92E1801F1FF for ; Tue, 30 Oct 2018 21:36:10 +0000 (UTC) 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 , linux-fbdev@vger.kernel.org Cc: Yisheng Xie , Kees Cook , Bartlomiej Zolnierkiewicz , Daniel Vetter , dri-devel@lists.freedesktop.org, Marko Myllynen , Hans de Goede , Thierry Reding List-Id: dri-devel@lists.freedesktop.org SSBndWVzcyB5b3Ugd2Ugbm90IHZlcnkgcHJvZHVjdGl2ZSB3aXRoIHRoYXQgZmlyc3QgcGF0Y2gg Oy0pCgotLSBTdGV2ZQoKCk9uIE9jdG9iZXIgMzAsIDIwMTggNTo0NDoxOSBQTSBHTVQrMDI6MDAs IFByYXJpdCBCaGFyZ2F2YSA8cHJhcml0QHJlZGhhdC5jb20+IHdyb3RlOgo+T24gdGV4dC1iYXNl ZCBzeXN0ZW1zIHRoZSAncXVpZXQnIGJvb3Qgb3B0aW9uIHdpbGwgc2hvdyBwcmludGsgbGV2ZWxz Cj5oaWdoZXIgdGhhbiBDT05TT0xFX0xPR0xFVkVMX1FVSUVULiAgVGhlIGRpc3BsYXlpbmcgb2Yg dGhlIFR1eCBsb2dvCj5kdXJpbmcgYm9vdCBjYW4gY2F1c2Ugc29tZSBjb25zb2xlcyB0byBsb3Nl IGRpc3BsYXkgZGF0YSBhbmQgYXMgYQo+cmVzdWx0Cj5jb25mdXNlIHRoZSBlbmQgdXNlci4KPgo+ RG8gbm90IGRpc3BsYXkgdGhlIFR1eCBsb2dvIG9uIHN5c3RlbXMgdGhhdCBhcmUgaW4gJ3F1aWV0 JyBib290Lgo+Cj52MjogSXQgaGVscHMgdG8gY29tbWl0IGFsbCBteSBjaGFuZ2VzIGJlZm9yZSBz ZW5kaW5nIHRoZW0uICBSZW1vdmUKPmV4dHJhCj5icmFja2V0Lgo+djM6IGJ1aWxkYm90IGVycm9y IGZpeDogZmJjb24gY2FuIGJlIGJ1aWx0IGFzIHBhcnQgb2YgYSBtb2R1bGUgc28KPmV4cG9ydCBj b25zb2xlX3ByaW50awo+Cj5TaWduZWQtb2ZmLWJ5OiBQcmFyaXQgQmhhcmdhdmEgPHByYXJpdEBy ZWRoYXQuY29tPgo+Q2M6IEhhbnMgZGUgR29lZGUgPGhkZWdvZWRlQHJlZGhhdC5jb20+Cj5DYzog TWFya28gTXlsbHluZW4gPG15bGx5bmVuQHJlZGhhdC5jb20+Cj5DYzogU3RldmVuIFJvc3RlZHQg KFZNd2FyZSkgPHJvc3RlZHRAZ29vZG1pcy5vcmc+Cj5DYzogQmFydGxvbWllaiBab2xuaWVya2ll d2ljeiA8Yi56b2xuaWVya2llQHNhbXN1bmcuY29tPgo+Q2M6IEtlZXMgQ29vayA8a2Vlc2Nvb2tA Y2hyb21pdW0ub3JnPgo+Q2M6IERhbmllbCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+ Cj5DYzogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KPkNjOiBZaXNoZW5nIFhp ZSA8eXN4aWVAZm94bWFpbC5jb20+Cj5DYzogZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9y Zwo+LS0tCj4gZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2ZiY29uLmMgfCAxMyArKysrKysrKy0t LS0tCj4ga2VybmVsL3ByaW50ay9wcmludGsuYyAgICAgICAgICAgfCAgMSArCj4gMiBmaWxlcyBj aGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCj4KPmRpZmYgLS1naXQgYS9k cml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJjb24uYwo+Yi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2Nv cmUvZmJjb24uYwo+aW5kZXggODk1OGNjYzhiMWFjLi4wOGUwOTJlYWY0NWMgMTAwNjQ0Cj4tLS0g YS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJjb24uYwo+KysrIGIvZHJpdmVycy92aWRlby9m YmRldi9jb3JlL2ZiY29uLmMKPkBAIC02NDksMTEgKzY0OSwxNCBAQCBzdGF0aWMgdm9pZCBmYmNv bl9wcmVwYXJlX2xvZ28oc3RydWN0IHZjX2RhdGEKPip2Yywgc3RydWN0IGZiX2luZm8gKmluZm8s Cj4gCQlrZnJlZShzYXZlKTsKPiAJfQo+IAo+KwlpZiAobG9nb19zaG93biA9PSBGQkNPTl9MT0dP X0RPTlRTSE9XKQo+KwkJcmV0dXJuOwo+Kwo+IAlpZiAobG9nb19saW5lcyA+IHZjLT52Y19ib3R0 b20pIHsKPiAJCWxvZ29fc2hvd24gPSBGQkNPTl9MT0dPX0NBTlNIT1c7Cj4gCQlwcmludGsoS0VS Tl9JTkZPCj4JCSAgICAgICAiZmJjb25faW5pdDogZGlzYWJsZSBib290LWxvZ28gKGJvb3QtbG9n byBiaWdnZXIgdGhhbgo+c2NyZWVuKS5cbiIpOwo+LQl9IGVsc2UgaWYgKGxvZ29fc2hvd24gIT0g RkJDT05fTE9HT19ET05UU0hPVykgewo+Kwl9IGVsc2Ugewo+IAkJbG9nb19zaG93biA9IEZCQ09O X0xPR09fRFJBVzsKPiAJCXZjLT52Y190b3AgPSBsb2dvX2xpbmVzOwo+IAl9Cj5AQCAtMTA1MSw3 ICsxMDU0LDcgQEAgc3RhdGljIHZvaWQgZmJjb25faW5pdChzdHJ1Y3QgdmNfZGF0YSAqdmMsIGlu dAo+aW5pdCkKPiAJc3RydWN0IHZjX2RhdGEgKipkZWZhdWx0X21vZGUgPSB2Yy0+dmNfZGlzcGxh eV9mZzsKPiAJc3RydWN0IHZjX2RhdGEgKnN2YyA9ICpkZWZhdWx0X21vZGU7Cj4gCXN0cnVjdCBk aXNwbGF5ICp0LCAqcCA9ICZmYl9kaXNwbGF5W3ZjLT52Y19udW1dOwo+LQlpbnQgbG9nbyA9IDEs IG5ld19yb3dzLCBuZXdfY29scywgcm93cywgY29scywgY2hhcmNudCA9IDI1NjsKPisJaW50IG5l d19yb3dzLCBuZXdfY29scywgcm93cywgY29scywgY2hhcmNudCA9IDI1NjsKPiAJaW50IGNhcCwg cmV0Owo+IAo+IAlpZiAoaW5mb19pZHggPT0gLTEgfHwgaW5mbyA9PSBOVUxMKQo+QEAgLTEwNTks OSArMTA2Miw5IEBAIHN0YXRpYyB2b2lkIGZiY29uX2luaXQoc3RydWN0IHZjX2RhdGEgKnZjLCBp bnQKPmluaXQpCj4gCj4gCWNhcCA9IGluZm8tPmZsYWdzOwo+IAo+LQlpZiAodmMgIT0gc3ZjIHx8 IGxvZ29fc2hvd24gPT0gRkJDT05fTE9HT19ET05UU0hPVyB8fAo+KwlpZiAodmMgIT0gc3ZjIHx8 IGNvbnNvbGVfbG9nbGV2ZWwgPD0gQ09OU09MRV9MT0dMRVZFTF9RVUlFVCB8fAo+IAkgICAgKGlu Zm8tPmZpeC50eXBlID09IEZCX1RZUEVfVEVYVCkpCj4tCQlsb2dvID0gMDsKPisJCWxvZ29fc2hv d24gPSBGQkNPTl9MT0dPX0RPTlRTSE9XOwo+IAo+IAlpZiAodmFyX3RvX2Rpc3BsYXkocCwgJmlu Zm8tPnZhciwgaW5mbykpCj4gCQlyZXR1cm47Cj5AQCAtMTE3Niw3ICsxMTc5LDcgQEAgc3RhdGlj IHZvaWQgZmJjb25faW5pdChzdHJ1Y3QgdmNfZGF0YSAqdmMsIGludAo+aW5pdCkKPiAJfSBlbHNl Cj4gCQl2Y19yZXNpemUodmMsIG5ld19jb2xzLCBuZXdfcm93cyk7Cj4gCj4tCWlmIChsb2dvKQo+ KwlpZiAobG9nb19zaG93biAhPSBGQkNPTl9MT0dPX0RPTlRTSE9XKQo+IAkJZmJjb25fcHJlcGFy ZV9sb2dvKHZjLCBpbmZvLCBjb2xzLCByb3dzLCBuZXdfY29scywgbmV3X3Jvd3MpOwo+IAo+IAlp ZiAodmMgPT0gc3ZjICYmIHNvZnRiYWNrX2J1ZikKPmRpZmYgLS1naXQgYS9rZXJuZWwvcHJpbnRr L3ByaW50ay5jIGIva2VybmVsL3ByaW50ay9wcmludGsuYwo+aW5kZXggYjc3MTUwYWQxOTY1Li4z OTFlMzkwZmVhYzkgMTAwNjQ0Cj4tLS0gYS9rZXJuZWwvcHJpbnRrL3ByaW50ay5jCj4rKysgYi9r ZXJuZWwvcHJpbnRrL3ByaW50ay5jCj5AQCAtNjYsNiArNjYsNyBAQCBpbnQgY29uc29sZV9wcmlu dGtbNF0gPSB7Cj4gCUNPTlNPTEVfTE9HTEVWRUxfTUlOLAkJLyogbWluaW11bV9jb25zb2xlX2xv Z2xldmVsICovCj4gCUNPTlNPTEVfTE9HTEVWRUxfREVGQVVMVCwJLyogZGVmYXVsdF9jb25zb2xl X2xvZ2xldmVsICovCj4gfTsKPitFWFBPUlRfU1lNQk9MKGNvbnNvbGVfcHJpbnRrKTsKPiAKPiBh dG9taWNfdCBpZ25vcmVfY29uc29sZV9sb2NrX3dhcm5pbmcgX19yZWFkX21vc3RseSA9IEFUT01J Q19JTklUKDApOwo+IEVYUE9SVF9TWU1CT0woaWdub3JlX2NvbnNvbGVfbG9ja193YXJuaW5nKTsK Ci0tIApTZW50IGZyb20gbXkgQW5kcm9pZCBkZXZpY2Ugd2l0aCBLLTkgTWFpbC4gUGxlYXNlIGV4 Y3VzZSBteSBicmV2aXR5IGFuZCB0b3AgcG9zdGluZy4KX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxA bGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxt YW4vbGlzdGluZm8vZHJpLWRldmVsCg==