From mboxrd@z Thu Jan 1 00:00:00 1970 From: Prarit Bhargava Date: Tue, 29 Jan 2019 13:43:50 +0000 Subject: [PATCH v5 2/2] fbcon: Silence fbcon logo on 'quiet' boots Message-Id: <20190129134350.24049-3-prarit@redhat.com> List-Id: References: <20190129134350.24049-1-prarit@redhat.com> In-Reply-To: <20190129134350.24049-1-prarit@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-fbdev@vger.kernel.org Cc: Prarit Bhargava , Yisheng Xie , Kees Cook , Bartlomiej Zolnierkiewicz , Daniel Vetter , Steven Rostedt , Marko Myllynen , Hans de Goede , dri-devel@lists.freedesktop.org, Thierry Reding 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 v4: move console_printk change to separate patch, and drop logo cleanup v5: Only set FBCON_LOGO_DONTSHOW for console loglevel 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 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index bfa1360ec750..59b626356983 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -656,11 +656,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; } @@ -1066,6 +1069,9 @@ static void fbcon_init(struct vc_data *vc, int init) cap = info->flags; + if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET) + logo_shown = FBCON_LOGO_DONTSHOW; + if (vc != svc || logo_shown = FBCON_LOGO_DONTSHOW || (info->fix.type = FB_TYPE_TEXT)) logo = 0; -- 2.17.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Prarit Bhargava Subject: [PATCH v5 2/2] fbcon: Silence fbcon logo on 'quiet' boots Date: Tue, 29 Jan 2019 08:43:50 -0500 Message-ID: <20190129134350.24049-3-prarit@redhat.com> References: <20190129134350.24049-1-prarit@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTPS id 474766E837 for ; Tue, 29 Jan 2019 13:43:59 +0000 (UTC) In-Reply-To: <20190129134350.24049-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: linux-fbdev@vger.kernel.org Cc: Prarit Bhargava , Yisheng Xie , Kees Cook , 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 T24gdGV4dC1iYXNlZCBzeXN0ZW1zIHRoZSAncXVpZXQnIGJvb3Qgb3B0aW9uIHdpbGwgc2hvdyBw cmludGsgbGV2ZWxzCmhpZ2hlciB0aGFuIENPTlNPTEVfTE9HTEVWRUxfUVVJRVQuICBUaGUgZGlz cGxheWluZyBvZiB0aGUgVHV4IGxvZ28KZHVyaW5nIGJvb3QgY2FuIGNhdXNlIHNvbWUgY29uc29s ZXMgdG8gbG9zZSBkaXNwbGF5IGRhdGEgYW5kIGFzIGEgcmVzdWx0CmNvbmZ1c2UgdGhlIGVuZCB1 c2VyLgoKRG8gbm90IGRpc3BsYXkgdGhlIFR1eCBsb2dvIG9uIHN5c3RlbXMgdGhhdCBhcmUgaW4g J3F1aWV0JyBib290LgoKdjI6IEl0IGhlbHBzIHRvIGNvbW1pdCBhbGwgbXkgY2hhbmdlcyBiZWZv cmUgc2VuZGluZyB0aGVtLiAgUmVtb3ZlIGV4dHJhCmJyYWNrZXQuCnYzOiBidWlsZGJvdCBlcnJv ciBmaXg6IGZiY29uIGNhbiBiZSBidWlsdCBhcyBwYXJ0IG9mIGEgbW9kdWxlIHNvIGV4cG9ydCBj b25zb2xlX3ByaW50awp2NDogbW92ZSBjb25zb2xlX3ByaW50ayBjaGFuZ2UgdG8gc2VwYXJhdGUg cGF0Y2gsIGFuZCBkcm9wIGxvZ28gY2xlYW51cAp2NTogT25seSBzZXQgRkJDT05fTE9HT19ET05U U0hPVyBmb3IgY29uc29sZSBsb2dsZXZlbAoKU2lnbmVkLW9mZi1ieTogUHJhcml0IEJoYXJnYXZh IDxwcmFyaXRAcmVkaGF0LmNvbT4KQ2M6IEhhbnMgZGUgR29lZGUgPGhkZWdvZWRlQHJlZGhhdC5j b20+CkNjOiBNYXJrbyBNeWxseW5lbiA8bXlsbHluZW5AcmVkaGF0LmNvbT4KQ2M6IFN0ZXZlbiBS b3N0ZWR0IChWTXdhcmUpIDxyb3N0ZWR0QGdvb2RtaXMub3JnPgpDYzogQmFydGxvbWllaiBab2xu aWVya2lld2ljeiA8Yi56b2xuaWVya2llQHNhbXN1bmcuY29tPgpDYzogS2VlcyBDb29rIDxrZWVz Y29va0BjaHJvbWl1bS5vcmc+CkNjOiBEYW5pZWwgVmV0dGVyIDxkYW5pZWwudmV0dGVyQGZmd2xs LmNoPgpDYzogVGhpZXJyeSBSZWRpbmcgPHRyZWRpbmdAbnZpZGlhLmNvbT4KQ2M6IFlpc2hlbmcg WGllIDx5c3hpZUBmb3htYWlsLmNvbT4KQ2M6IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5v cmcKLS0tCiBkcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJjb24uYyB8IDggKysrKysrKy0KIDEg ZmlsZSBjaGFuZ2VkLCA3IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQg YS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJjb24uYyBiL2RyaXZlcnMvdmlkZW8vZmJkZXYv Y29yZS9mYmNvbi5jCmluZGV4IGJmYTEzNjBlYzc1MC4uNTliNjI2MzU2OTgzIDEwMDY0NAotLS0g YS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJjb24uYworKysgYi9kcml2ZXJzL3ZpZGVvL2Zi ZGV2L2NvcmUvZmJjb24uYwpAQCAtNjU2LDExICs2NTYsMTQgQEAgc3RhdGljIHZvaWQgZmJjb25f cHJlcGFyZV9sb2dvKHN0cnVjdCB2Y19kYXRhICp2Yywgc3RydWN0IGZiX2luZm8gKmluZm8sCiAJ CWtmcmVlKHNhdmUpOwogCX0KIAorCWlmIChsb2dvX3Nob3duID09IEZCQ09OX0xPR09fRE9OVFNI T1cpCisJCXJldHVybjsKKwogCWlmIChsb2dvX2xpbmVzID4gdmMtPnZjX2JvdHRvbSkgewogCQls b2dvX3Nob3duID0gRkJDT05fTE9HT19DQU5TSE9XOwogCQlwcmludGsoS0VSTl9JTkZPCiAJCSAg ICAgICAiZmJjb25faW5pdDogZGlzYWJsZSBib290LWxvZ28gKGJvb3QtbG9nbyBiaWdnZXIgdGhh biBzY3JlZW4pLlxuIik7Ci0JfSBlbHNlIGlmIChsb2dvX3Nob3duICE9IEZCQ09OX0xPR09fRE9O VFNIT1cpIHsKKwl9IGVsc2UgewogCQlsb2dvX3Nob3duID0gRkJDT05fTE9HT19EUkFXOwogCQl2 Yy0+dmNfdG9wID0gbG9nb19saW5lczsKIAl9CkBAIC0xMDY2LDYgKzEwNjksOSBAQCBzdGF0aWMg dm9pZCBmYmNvbl9pbml0KHN0cnVjdCB2Y19kYXRhICp2YywgaW50IGluaXQpCiAKIAljYXAgPSBp bmZvLT5mbGFnczsKIAorCWlmIChjb25zb2xlX2xvZ2xldmVsIDw9IENPTlNPTEVfTE9HTEVWRUxf UVVJRVQpCisJCWxvZ29fc2hvd24gPSBGQkNPTl9MT0dPX0RPTlRTSE9XOworCiAJaWYgKHZjICE9 IHN2YyB8fCBsb2dvX3Nob3duID09IEZCQ09OX0xPR09fRE9OVFNIT1cgfHwKIAkgICAgKGluZm8t PmZpeC50eXBlID09IEZCX1RZUEVfVEVYVCkpCiAJCWxvZ28gPSAwOwotLSAKMi4xNy4yCgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFp bGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5m cmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK