From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Schwab Date: Tue, 02 Apr 2019 18:09:27 +0000 Subject: [PATCH] fbcon: Don't reset logo_shown when logo is currently shown Message-Id: <87imvwp9d4.fsf_-_@igel.home> List-Id: References: <20190129134350.24049-1-prarit@redhat.com> <20190129134350.24049-3-prarit@redhat.com> <87ftr1ed4h.fsf@igel.home> <8590ff59-a4fb-5a02-fda4-086476efcbe6@redhat.com> In-Reply-To: <8590ff59-a4fb-5a02-fda4-086476efcbe6@redhat.com> (Prarit Bhargava's message of "Tue, 2 Apr 2019 07:31:49 -0400") MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Prarit Bhargava Cc: Marko Myllynen , linux-fbdev@vger.kernel.org, Kees Cook , Bartlomiej Zolnierkiewicz , Daniel Vetter , Steven Rostedt , Yisheng Xie , Hans de Goede , dri-devel@lists.freedesktop.org, Thierry Reding When the logo is currently drawn on a virtual console, and the console loglevel is reduced to quiet, logo_shown must be left alone, so that it the scrolling region on that virtual console is properly reset. Fixes: 10993504d647 ("fbcon: Silence fbcon logo on 'quiet' boots") Signed-off-by: Andreas Schwab --- On Apr 02 2019, Prarit Bhargava wrote: > On 4/1/19 3:31 PM, Andreas Schwab wrote: >> On Jan 29 2019, Prarit Bhargava wrote: >> >>> @@ -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; >> >> This causes the scroll region to no longer be reset when the logo is >> removed. >> > > Andreas, my apologies but I'm not sure what you mean. Could you elaborate on > the broken and expected behaviour? [ 3.204286] fbcon_init: logo_shown = -1, console_loglevel = 7 [ 11.840899] fbcon_init: logo_shown = 0, console_loglevel = 1 [ 35.344877] fbcon_init: logo_shown = -3, console_loglevel = 1 [ 35.345274] fbcon_init: logo_shown = -3, console_loglevel = 1 [ 35.345622] fbcon_init: logo_shown = -3, console_loglevel = 1 [ 35.345974] fbcon_init: logo_shown = -3, console_loglevel = 1 [ 35.346375] fbcon_init: logo_shown = -3, console_loglevel = 1 logo_shown must not be reset when non-negative. Andreas. --- drivers/video/fbdev/core/fbcon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index cd059a801662..786f9aab55df 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -1069,7 +1069,7 @@ static void fbcon_init(struct vc_data *vc, int init) cap = info->flags; - if (console_loglevel <= CONSOLE_LOGLEVEL_QUIET) + if (logo_shown < 0 && console_loglevel <= CONSOLE_LOGLEVEL_QUIET) logo_shown = FBCON_LOGO_DONTSHOW; if (vc != svc || logo_shown = FBCON_LOGO_DONTSHOW || -- 2.21.0 -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1 "And now for something completely different." From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andreas Schwab Subject: [PATCH] fbcon: Don't reset logo_shown when logo is currently shown Date: Tue, 02 Apr 2019 20:09:27 +0200 Message-ID: <87imvwp9d4.fsf_-_@igel.home> References: <20190129134350.24049-1-prarit@redhat.com> <20190129134350.24049-3-prarit@redhat.com> <87ftr1ed4h.fsf@igel.home> <8590ff59-a4fb-5a02-fda4-086476efcbe6@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5B3B96E48C for ; Tue, 2 Apr 2019 18:09:34 +0000 (UTC) In-Reply-To: <8590ff59-a4fb-5a02-fda4-086476efcbe6@redhat.com> (Prarit Bhargava's message of "Tue, 2 Apr 2019 07:31:49 -0400") 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: Marko Myllynen , linux-fbdev@vger.kernel.org, Kees Cook , Bartlomiej Zolnierkiewicz , Daniel Vetter , Steven Rostedt , Yisheng Xie , Hans de Goede , dri-devel@lists.freedesktop.org, Thierry Reding List-Id: dri-devel@lists.freedesktop.org V2hlbiB0aGUgbG9nbyBpcyBjdXJyZW50bHkgZHJhd24gb24gYSB2aXJ0dWFsIGNvbnNvbGUsIGFu ZCB0aGUgY29uc29sZQpsb2dsZXZlbCBpcyByZWR1Y2VkIHRvIHF1aWV0LCBsb2dvX3Nob3duIG11 c3QgYmUgbGVmdCBhbG9uZSwgc28gdGhhdCBpdAp0aGUgc2Nyb2xsaW5nIHJlZ2lvbiBvbiB0aGF0 IHZpcnR1YWwgY29uc29sZSBpcyBwcm9wZXJseSByZXNldC4KCkZpeGVzOiAxMDk5MzUwNGQ2NDcg KCJmYmNvbjogU2lsZW5jZSBmYmNvbiBsb2dvIG9uICdxdWlldCcgYm9vdHMiKQpTaWduZWQtb2Zm LWJ5OiBBbmRyZWFzIFNjaHdhYiA8c2Nod2FiQGxpbnV4LW02OGsub3JnPgotLS0KT24gQXByIDAy IDIwMTksIFByYXJpdCBCaGFyZ2F2YSA8cHJhcml0QHJlZGhhdC5jb20+IHdyb3RlOgoKPiBPbiA0 LzEvMTkgMzozMSBQTSwgQW5kcmVhcyBTY2h3YWIgd3JvdGU6Cj4+IE9uIEphbiAyOSAyMDE5LCBQ cmFyaXQgQmhhcmdhdmEgPHByYXJpdEByZWRoYXQuY29tPiB3cm90ZToKPj4gCj4+PiBAQCAtMTA2 Niw2ICsxMDY5LDkgQEAgc3RhdGljIHZvaWQgZmJjb25faW5pdChzdHJ1Y3QgdmNfZGF0YSAqdmMs IGludCBpbml0KQo+Pj4gIAo+Pj4gIAljYXAgPSBpbmZvLT5mbGFnczsKPj4+ICAKPj4+ICsJaWYg KGNvbnNvbGVfbG9nbGV2ZWwgPD0gQ09OU09MRV9MT0dMRVZFTF9RVUlFVCkKPj4+ICsJCWxvZ29f c2hvd24gPSBGQkNPTl9MT0dPX0RPTlRTSE9XOwo+Pj4gKwo+Pj4gIAlpZiAodmMgIT0gc3ZjIHx8 IGxvZ29fc2hvd24gPT0gRkJDT05fTE9HT19ET05UU0hPVyB8fAo+Pj4gIAkgICAgKGluZm8tPmZp eC50eXBlID09IEZCX1RZUEVfVEVYVCkpCj4+PiAgCQlsb2dvID0gMDsKPj4gCj4+IFRoaXMgY2F1 c2VzIHRoZSBzY3JvbGwgcmVnaW9uIHRvIG5vIGxvbmdlciBiZSByZXNldCB3aGVuIHRoZSBsb2dv IGlzCj4+IHJlbW92ZWQuCj4+IAo+Cj4gQW5kcmVhcywgbXkgYXBvbG9naWVzIGJ1dCBJJ20gbm90 IHN1cmUgd2hhdCB5b3UgbWVhbi4gIENvdWxkIHlvdSBlbGFib3JhdGUgb24KPiB0aGUgYnJva2Vu IGFuZCBleHBlY3RlZCBiZWhhdmlvdXI/CgpbICAgIDMuMjA0Mjg2XSBmYmNvbl9pbml0OiBsb2dv X3Nob3duID0gLTEsIGNvbnNvbGVfbG9nbGV2ZWwgPSA3ClsgICAxMS44NDA4OTldIGZiY29uX2lu aXQ6IGxvZ29fc2hvd24gPSAwLCBjb25zb2xlX2xvZ2xldmVsID0gMQpbICAgMzUuMzQ0ODc3XSBm YmNvbl9pbml0OiBsb2dvX3Nob3duID0gLTMsIGNvbnNvbGVfbG9nbGV2ZWwgPSAxClsgICAzNS4z NDUyNzRdIGZiY29uX2luaXQ6IGxvZ29fc2hvd24gPSAtMywgY29uc29sZV9sb2dsZXZlbCA9IDEK WyAgIDM1LjM0NTYyMl0gZmJjb25faW5pdDogbG9nb19zaG93biA9IC0zLCBjb25zb2xlX2xvZ2xl dmVsID0gMQpbICAgMzUuMzQ1OTc0XSBmYmNvbl9pbml0OiBsb2dvX3Nob3duID0gLTMsIGNvbnNv bGVfbG9nbGV2ZWwgPSAxClsgICAzNS4zNDYzNzVdIGZiY29uX2luaXQ6IGxvZ29fc2hvd24gPSAt MywgY29uc29sZV9sb2dsZXZlbCA9IDEKCmxvZ29fc2hvd24gbXVzdCBub3QgYmUgcmVzZXQgd2hl biBub24tbmVnYXRpdmUuCgpBbmRyZWFzLgotLS0KIGRyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9m YmNvbi5jIHwgMiArLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9u KC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2ZiY29uLmMgYi9kcml2 ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJjb24uYwppbmRleCBjZDA1OWE4MDE2NjIuLjc4NmY5YWFi NTVkZiAxMDA2NDQKLS0tIGEvZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2ZiY29uLmMKKysrIGIv ZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2ZiY29uLmMKQEAgLTEwNjksNyArMTA2OSw3IEBAIHN0 YXRpYyB2b2lkIGZiY29uX2luaXQoc3RydWN0IHZjX2RhdGEgKnZjLCBpbnQgaW5pdCkKIAogCWNh cCA9IGluZm8tPmZsYWdzOwogCi0JaWYgKGNvbnNvbGVfbG9nbGV2ZWwgPD0gQ09OU09MRV9MT0dM RVZFTF9RVUlFVCkKKwlpZiAobG9nb19zaG93biA8IDAgJiYgY29uc29sZV9sb2dsZXZlbCA8PSBD T05TT0xFX0xPR0xFVkVMX1FVSUVUKQogCQlsb2dvX3Nob3duID0gRkJDT05fTE9HT19ET05UU0hP VzsKIAogCWlmICh2YyAhPSBzdmMgfHwgbG9nb19zaG93biA9PSBGQkNPTl9MT0dPX0RPTlRTSE9X IHx8Ci0tIAoyLjIxLjAKCi0tIApBbmRyZWFzIFNjaHdhYiwgc2Nod2FiQGxpbnV4LW02OGsub3Jn CkdQRyBLZXkgZmluZ2VycHJpbnQgPSA3NTc4IEVCNDcgRDRFNSA0RDY5IDI1MTAgIDI1NTIgREY3 MyBFNzgwIEE5REEgQUVDMQoiQW5kIG5vdyBmb3Igc29tZXRoaW5nIGNvbXBsZXRlbHkgZGlmZmVy ZW50LiIKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJp LWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBz Oi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs