From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 09/33] fbcon: Remove fbcon_has_exited Date: Mon, 27 May 2019 08:10:42 +0200 Message-ID: <20190527061042.GF21222@phenom.ffwll.local> References: <20190524085354.27411-1-daniel.vetter@ffwll.ch> <20190524085354.27411-10-daniel.vetter@ffwll.ch> <20190525153826.GA8661@ravnborg.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20190525153826.GA8661@ravnborg.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Sam Ravnborg Cc: Prarit Bhargava , Kees Cook , Bartlomiej Zolnierkiewicz , Daniel Vetter , Intel Graphics Development , LKML , DRI Development , Yisheng Xie , Daniel Vetter , Konstantin Khorenko List-Id: dri-devel@lists.freedesktop.org T24gU2F0LCBNYXkgMjUsIDIwMTkgYXQgMDU6Mzg6MjZQTSArMDIwMCwgU2FtIFJhdm5ib3JnIHdy b3RlOgo+IEhpIERhbmllbC4KPiAKPiBPbmUgZGV0YWlsIEkgbm90aWNlZCB3aGlsZSBicm9zaW5n IHRoZSBjaGFuZ2VzLgo+IAo+ID4gIAo+ID4gQEAgLTEwNjQsOSArMTA2MiwxMyBAQCBzdGF0aWMg dm9pZCBmYmNvbl9pbml0KHN0cnVjdCB2Y19kYXRhICp2YywgaW50IGluaXQpCj4gPiAgCWludCBs b2dvID0gMSwgbmV3X3Jvd3MsIG5ld19jb2xzLCByb3dzLCBjb2xzLCBjaGFyY250ID0gMjU2Owo+ ID4gIAlpbnQgY2FwLCByZXQ7Cj4gPiAgCj4gPiAtCWlmIChpbmZvX2lkeCA9PSAtMSB8fCBpbmZv ID09IE5VTEwpCj4gPiArCWlmIChXQVJOX09OKGluZm9faWR4ID09IC0xKSkKPiA+ICAJICAgIHJl dHVybjsKPiA+ICAKPiA+ICsJaWYgKGNvbjJmYl9tYXBbdmMtPnZjX251bV0gPT0gLTEpCj4gPiAr CQljb24yZmJfbWFwW3ZjLT52Y19udW1dID0gaW5mb19pZHg7Cj4gPiArCj4gPiArCWluZm8gPSBy ZWdpc3RlcmVkX2ZiW2NvbjJmYl9tYXBbdmMtPnZjX251bV1dOwo+ID4gIAljYXAgPSBpbmZvLT5m bGFnczsKPiAKPiBXaGVuIGluZm8gaXMgZGVmaW5lZCBpdCBpcyBhbHNvIGFzc2lnbmVkOgo+IHN0 cnVjdCBmYl9pbmZvICppbmZvID0gcmVnaXN0ZXJlZF9mYltjb24yZmJfbWFwW3ZjLT52Y19udW1d XTsKPiAKPiBBcyB0aGUgdGVzdCBmb3IgaW5mbyBpcyBnb25lIHRoaXMgYXNzaWdubWVudCBpcyBu byBsb25nZXIKPiByZXF1cmlyZWQgYW5kIGNhbiBiZSBkZWxldGVkLgoKV2UgdXNlIGl0IGxhdGVy IG9uLCBzbyB3ZSBkZWZpbml0ZWx5IHN0aWxsIG5lZWQgaW5mby4gQnV0IEkgaW5kZWVkIGZvcmdv dAp0byBkZWxldGUgdGhlIGluaXRpYWwgYXNzaWdubWVudCBvZiBpbmZvIGF0IHRoZSBmdW5jdGlv biBzdGFydC4gSXMgdGhhdAp3aGF0IHlvdSBtZWFuIGhlcmU/Cj4KPiBUaGUgY29kZSBub3cgYXNz dW1lcyB0aGF0IHRoZXJlIGlzIGFsd2F5cyBhbiBmYl9pbmZvIGlmIGNvbjJmYl9tYXBbXQo+IGlz IG5vdCBzZXQgdG8gLTEuIEkgY291bGQgbm90IGRldGVybWluZSBpZiB0aGlzIGlzIE9LLCBidXQg dGhpcwo+IGxpa2VseSBib2lscyBkb3duIHRvIHlvdXIgbG9ja2luZyBjb25jZXJuIG9mIHJlZ2lz dGVyZWRfZmIuCgpZdXAsIHNlZSBob3cgZmJfcmVnaXN0ZXJlZC91bnJlZ2lzdGVyZWQgbWFuYWdl IHRoaXMuIEkgdGhpbmsgdGhhdCBwYXJ0CmFjdHVhbGx5IGFsbCB3b3JrcyBvdXQgY29ycmVjdGx5 IChhcyBsb25nIGFzIGV2ZXJ5b25lIGlzIGhvbGRpbmcKY29uc29sZV9sb2NrKS4gQnV0IGl0J3Mg YSBiaXQgdW5wcmV0dHkgdGhhdCBmYmNvbiBkaWdzIGFyb3VuZCBpbiB0aGUgcmF3CnJlZ2lzdGVy ZWRfZmIgYXJyYXkgaW5zdGVhZCBvZiBnb2luZyB0aHJvdWdoIHRoZSByZWZjb3VudGVkIGhlbHBl cnMsIGFuZApoYXZpbmcgYSBmdWxsIHJlZmNvdW50ZWQgcG9pbnRlci4gTXVjaCBlYXNpZXIgdG8g Y29udmluY2UgeW91cnNlbGYgb2YgdGhhdAp0aGFuIGNoYXNpbmcgaW5kaWNlcyBhc3NpZ21lbnRz IGFsbCBvdmVyIGltby4KLURhbmllbAoKPiAKPiAJU2FtCj4gCj4gPiAgCj4gPiAgCWlmIChsb2dv X3Nob3duIDwgMCAmJiBjb25zb2xlX2xvZ2xldmVsIDw9IENPTlNPTEVfTE9HTEVWRUxfUVVJRVQp Cj4gPiBAQCAtMzMzNiwxNCArMzMzOCw2IEBAIHN0YXRpYyBpbnQgZmJjb25fZXZlbnRfbm90aWZ5 KHN0cnVjdCBub3RpZmllcl9ibG9jayAqc2VsZiwKPiA+ICAJc3RydWN0IGZiX2JsaXRfY2FwcyAq Y2FwczsKPiA+ICAJaW50IGlkeCwgcmV0ID0gMDsKPiA+ICAKPiA+IC0JLyoKPiA+IC0JICogaWdu b3JlIGFsbCBldmVudHMgZXhjZXB0IGRyaXZlciByZWdpc3RyYXRpb24gYW5kIGRlcmVnaXN0cmF0 aW9uCj4gPiAtCSAqIGlmIGZiY29uIGlzIG5vdCBhY3RpdmUKPiA+IC0JICovCj4gPiAtCWlmIChm YmNvbl9oYXNfZXhpdGVkICYmICEoYWN0aW9uID09IEZCX0VWRU5UX0ZCX1JFR0lTVEVSRUQgfHwK PiA+IC0JCQkJICBhY3Rpb24gPT0gRkJfRVZFTlRfRkJfVU5SRUdJU1RFUkVEKSkKPiA+IC0JCWdv dG8gZG9uZTsKPiA+IC0KPiA+ICAJc3dpdGNoKGFjdGlvbikgewo+ID4gIAljYXNlIEZCX0VWRU5U X1NVU1BFTkQ6Cj4gPiAgCQlmYmNvbl9zdXNwZW5kZWQoaW5mbyk7Cj4gPiBAQCAtMzM5Niw3ICsz MzkwLDYgQEAgc3RhdGljIGludCBmYmNvbl9ldmVudF9ub3RpZnkoc3RydWN0IG5vdGlmaWVyX2Js b2NrICpzZWxmLAo+ID4gIAkJZmJjb25fcmVtYXBfYWxsKGlkeCk7Cj4gPiAgCQlicmVhazsKPiA+ ICAJfQo+ID4gLWRvbmU6Cj4gPiAgCXJldHVybiByZXQ7Cj4gPiAgfQo+ID4gIAo+ID4gQEAgLTM0 NDMsOSArMzQzNiw2IEBAIHN0YXRpYyBzc2l6ZV90IHN0b3JlX3JvdGF0ZShzdHJ1Y3QgZGV2aWNl ICpkZXZpY2UsCj4gPiAgCWludCByb3RhdGUsIGlkeDsKPiA+ICAJY2hhciAqKmxhc3QgPSBOVUxM Owo+ID4gIAo+ID4gLQlpZiAoZmJjb25faGFzX2V4aXRlZCkKPiA+IC0JCXJldHVybiBjb3VudDsK PiA+IC0KPiA+ICAJY29uc29sZV9sb2NrKCk7Cj4gPiAgCWlkeCA9IGNvbjJmYl9tYXBbZmdfY29u c29sZV07Cj4gPiAgCj4gPiBAQCAtMzQ2OCw5ICszNDU4LDYgQEAgc3RhdGljIHNzaXplX3Qgc3Rv cmVfcm90YXRlX2FsbChzdHJ1Y3QgZGV2aWNlICpkZXZpY2UsCj4gPiAgCWludCByb3RhdGUsIGlk eDsKPiA+ICAJY2hhciAqKmxhc3QgPSBOVUxMOwo+ID4gIAo+ID4gLQlpZiAoZmJjb25faGFzX2V4 aXRlZCkKPiA+IC0JCXJldHVybiBjb3VudDsKPiA+IC0KPiA+ICAJY29uc29sZV9sb2NrKCk7Cj4g PiAgCWlkeCA9IGNvbjJmYl9tYXBbZmdfY29uc29sZV07Cj4gPiAgCj4gPiBAQCAtMzQ5MSw5ICsz NDc4LDYgQEAgc3RhdGljIHNzaXplX3Qgc2hvd19yb3RhdGUoc3RydWN0IGRldmljZSAqZGV2aWNl LAo+ID4gIAlzdHJ1Y3QgZmJfaW5mbyAqaW5mbzsKPiA+ICAJaW50IHJvdGF0ZSA9IDAsIGlkeDsK PiA+ICAKPiA+IC0JaWYgKGZiY29uX2hhc19leGl0ZWQpCj4gPiAtCQlyZXR1cm4gMDsKPiA+IC0K PiA+ICAJY29uc29sZV9sb2NrKCk7Cj4gPiAgCWlkeCA9IGNvbjJmYl9tYXBbZmdfY29uc29sZV07 Cj4gPiAgCj4gPiBAQCAtMzUxNCw5ICszNDk4LDYgQEAgc3RhdGljIHNzaXplX3Qgc2hvd19jdXJz b3JfYmxpbmsoc3RydWN0IGRldmljZSAqZGV2aWNlLAo+ID4gIAlzdHJ1Y3QgZmJjb25fb3BzICpv cHM7Cj4gPiAgCWludCBpZHgsIGJsaW5rID0gLTE7Cj4gPiAgCj4gPiAtCWlmIChmYmNvbl9oYXNf ZXhpdGVkKQo+ID4gLQkJcmV0dXJuIDA7Cj4gPiAtCj4gPiAgCWNvbnNvbGVfbG9jaygpOwo+ID4g IAlpZHggPSBjb24yZmJfbWFwW2ZnX2NvbnNvbGVdOwo+ID4gIAo+ID4gQEAgLTM1NDMsOSArMzUy NCw2IEBAIHN0YXRpYyBzc2l6ZV90IHN0b3JlX2N1cnNvcl9ibGluayhzdHJ1Y3QgZGV2aWNlICpk ZXZpY2UsCj4gPiAgCWludCBibGluaywgaWR4Owo+ID4gIAljaGFyICoqbGFzdCA9IE5VTEw7Cj4g PiAgCj4gPiAtCWlmIChmYmNvbl9oYXNfZXhpdGVkKQo+ID4gLQkJcmV0dXJuIGNvdW50Owo+ID4g LQo+ID4gIAljb25zb2xlX2xvY2soKTsKPiA+ICAJaWR4ID0gY29uMmZiX21hcFtmZ19jb25zb2xl XTsKPiA+ICAKPiA+IEBAIC0zNjY4LDkgKzM2NDYsNiBAQCBzdGF0aWMgdm9pZCBmYmNvbl9leGl0 KHZvaWQpCj4gPiAgCXN0cnVjdCBmYl9pbmZvICppbmZvOwo+ID4gIAlpbnQgaSwgaiwgbWFwcGVk Owo+ID4gIAo+ID4gLQlpZiAoZmJjb25faGFzX2V4aXRlZCkKPiA+IC0JCXJldHVybjsKPiA+IC0K PiA+ICAjaWZkZWYgQ09ORklHX0ZSQU1FQlVGRkVSX0NPTlNPTEVfREVGRVJSRURfVEFLRU9WRVIK PiA+ICAJaWYgKGRlZmVycmVkX3Rha2VvdmVyKSB7Cj4gPiAgCQlkdW1teWNvbl91bnJlZ2lzdGVy X291dHB1dF9ub3RpZmllcigmZmJjb25fb3V0cHV0X25iKTsKPiA+IEBAIC0zNjk1LDcgKzM2NzAs NyBAQCBzdGF0aWMgdm9pZCBmYmNvbl9leGl0KHZvaWQpCj4gPiAgCQlmb3IgKGogPSBmaXJzdF9m Yl92YzsgaiA8PSBsYXN0X2ZiX3ZjOyBqKyspIHsKPiA+ICAJCQlpZiAoY29uMmZiX21hcFtqXSA9 PSBpKSB7Cj4gPiAgCQkJCW1hcHBlZCA9IDE7Cj4gPiAtCQkJCWJyZWFrOwo+ID4gKwkJCQljb24y ZmJfbWFwW2pdID0gLTE7Cj4gPiAgCQkJfQo+ID4gIAkJfQo+ID4gIAo+ID4gQEAgLTM3MTgsOCAr MzY5Myw2IEBAIHN0YXRpYyB2b2lkIGZiY29uX2V4aXQodm9pZCkKPiA+ICAJCQkJaW5mby0+cXVl dWUuZnVuYyA9IE5VTEw7Cj4gPiAgCQl9Cj4gPiAgCX0KPiA+IC0KPiA+IC0JZmJjb25faGFzX2V4 aXRlZCA9IDE7Cj4gPiAgfQo+ID4gIAo+ID4gIHZvaWQgX19pbml0IGZiX2NvbnNvbGVfaW5pdCh2 b2lkKQo+ID4gLS0gCj4gPiAyLjIwLjEKPiA+IAo+ID4gX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KPiA+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiA+IGRy aS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKPiA+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0 b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCgotLSAKRGFuaWVsIFZldHRlcgpTb2Z0 d2FyZSBFbmdpbmVlciwgSW50ZWwgQ29ycG9yYXRpb24KaHR0cDovL2Jsb2cuZmZ3bGwuY2gKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4IG1h aWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFE2AC07542 for ; Mon, 27 May 2019 06:10:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7AA0A2075E for ; Mon, 27 May 2019 06:10:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="Z+eTylDr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726183AbfE0GKs (ORCPT ); Mon, 27 May 2019 02:10:48 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:40356 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725907AbfE0GKs (ORCPT ); Mon, 27 May 2019 02:10:48 -0400 Received: by mail-ed1-f68.google.com with SMTP id j12so24983639eds.7 for ; Sun, 26 May 2019 23:10:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=sender:date:from:to:cc:subject:message-id:mail-followup-to :references:mime-version:content-disposition:in-reply-to:user-agent; bh=aHQcZA86QadOz+hqte+kGa5A/aXSBOF9jgEN8JYF4HM=; b=Z+eTylDr8v0NnqgdFOxT1FsB+Gv/PP4fKMnQokTae0Nh6mADuZnJH5r9rleXV/+6NP CHmTMRs3RV7wt5U1LiOWfNYHss2hDXFFuXDLBEQSqOKgpzz0sQvchRSC8h/GQJsRIagy JdmFva87UC/Rh7hBX51Sp2WcMN/L9yZQ9fA6M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to:user-agent; bh=aHQcZA86QadOz+hqte+kGa5A/aXSBOF9jgEN8JYF4HM=; b=EpZezh7MuZfuFlK8EE2wTkYXvoAJfgHVVXE5Dqt/zoEJqGth9aG8pZMv8PiW2i6DQm HHYHFgOILGKgylnnAYskx4xN2m6FHFzakR/G8AS1OH4jz+LJfOcvCDerP+woIyCAddTk 2adOrB9+/TJM9GW92/6B7ouBwO5o5f0tuFZ+P9cKP98ZoVBVgY4NF5vacFRiKGha1jPZ hONgXR/kVQalYJpzp64NQ6ukkZUx5bjxE+8Qw4yu/9AEE77sIWIHeijbBxbFCINxmtb2 mWiMiuel/ADhCVtgE7U4esU4D26R6rL+JJNwmNI5cPMmuEU/nr/SfWy3EWeChox2b2Ft SS3Q== X-Gm-Message-State: APjAAAV97ZH02dY58Z9Gi+TcFvu5qUOk3dEgsMNSV/1dxAHarw7M0jDe BAulxXxqtbXeWz3ts1fMoLExVQ== X-Google-Smtp-Source: APXvYqw5DeaRhyIeIlB5ezWdqfd/I3KorqeJKmhUNN+wTqwQrdBepsfLJvMmK2DS7vWCzfiPR73EWg== X-Received: by 2002:a17:906:5e16:: with SMTP id n22mr53158605eju.28.1558937446036; Sun, 26 May 2019 23:10:46 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id h8sm1570633ejf.73.2019.05.26.23.10.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 26 May 2019 23:10:45 -0700 (PDT) Date: Mon, 27 May 2019 08:10:42 +0200 From: Daniel Vetter To: Sam Ravnborg Cc: Daniel Vetter , LKML , Prarit Bhargava , Kees Cook , Bartlomiej Zolnierkiewicz , Intel Graphics Development , DRI Development , Yisheng Xie , Hans de Goede , Daniel Vetter , Konstantin Khorenko Subject: Re: [PATCH 09/33] fbcon: Remove fbcon_has_exited Message-ID: <20190527061042.GF21222@phenom.ffwll.local> Mail-Followup-To: Sam Ravnborg , LKML , Prarit Bhargava , Kees Cook , Bartlomiej Zolnierkiewicz , Intel Graphics Development , DRI Development , Yisheng Xie , Hans de Goede , Daniel Vetter , Konstantin Khorenko References: <20190524085354.27411-1-daniel.vetter@ffwll.ch> <20190524085354.27411-10-daniel.vetter@ffwll.ch> <20190525153826.GA8661@ravnborg.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190525153826.GA8661@ravnborg.org> X-Operating-System: Linux phenom 4.14.0-3-amd64 User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, May 25, 2019 at 05:38:26PM +0200, Sam Ravnborg wrote: > Hi Daniel. > > One detail I noticed while brosing the changes. > > > > > @@ -1064,9 +1062,13 @@ static void fbcon_init(struct vc_data *vc, int init) > > int logo = 1, new_rows, new_cols, rows, cols, charcnt = 256; > > int cap, ret; > > > > - if (info_idx == -1 || info == NULL) > > + if (WARN_ON(info_idx == -1)) > > return; > > > > + if (con2fb_map[vc->vc_num] == -1) > > + con2fb_map[vc->vc_num] = info_idx; > > + > > + info = registered_fb[con2fb_map[vc->vc_num]]; > > cap = info->flags; > > When info is defined it is also assigned: > struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]]; > > As the test for info is gone this assignment is no longer > requrired and can be deleted. We use it later on, so we definitely still need info. But I indeed forgot to delete the initial assignment of info at the function start. Is that what you mean here? > > The code now assumes that there is always an fb_info if con2fb_map[] > is not set to -1. I could not determine if this is OK, but this > likely boils down to your locking concern of registered_fb. Yup, see how fb_registered/unregistered manage this. I think that part actually all works out correctly (as long as everyone is holding console_lock). But it's a bit unpretty that fbcon digs around in the raw registered_fb array instead of going through the refcounted helpers, and having a full refcounted pointer. Much easier to convince yourself of that than chasing indices assigments all over imo. -Daniel > > Sam > > > > > if (logo_shown < 0 && console_loglevel <= CONSOLE_LOGLEVEL_QUIET) > > @@ -3336,14 +3338,6 @@ static int fbcon_event_notify(struct notifier_block *self, > > struct fb_blit_caps *caps; > > int idx, ret = 0; > > > > - /* > > - * ignore all events except driver registration and deregistration > > - * if fbcon is not active > > - */ > > - if (fbcon_has_exited && !(action == FB_EVENT_FB_REGISTERED || > > - action == FB_EVENT_FB_UNREGISTERED)) > > - goto done; > > - > > switch(action) { > > case FB_EVENT_SUSPEND: > > fbcon_suspended(info); > > @@ -3396,7 +3390,6 @@ static int fbcon_event_notify(struct notifier_block *self, > > fbcon_remap_all(idx); > > break; > > } > > -done: > > return ret; > > } > > > > @@ -3443,9 +3436,6 @@ static ssize_t store_rotate(struct device *device, > > int rotate, idx; > > char **last = NULL; > > > > - if (fbcon_has_exited) > > - return count; > > - > > console_lock(); > > idx = con2fb_map[fg_console]; > > > > @@ -3468,9 +3458,6 @@ static ssize_t store_rotate_all(struct device *device, > > int rotate, idx; > > char **last = NULL; > > > > - if (fbcon_has_exited) > > - return count; > > - > > console_lock(); > > idx = con2fb_map[fg_console]; > > > > @@ -3491,9 +3478,6 @@ static ssize_t show_rotate(struct device *device, > > struct fb_info *info; > > int rotate = 0, idx; > > > > - if (fbcon_has_exited) > > - return 0; > > - > > console_lock(); > > idx = con2fb_map[fg_console]; > > > > @@ -3514,9 +3498,6 @@ static ssize_t show_cursor_blink(struct device *device, > > struct fbcon_ops *ops; > > int idx, blink = -1; > > > > - if (fbcon_has_exited) > > - return 0; > > - > > console_lock(); > > idx = con2fb_map[fg_console]; > > > > @@ -3543,9 +3524,6 @@ static ssize_t store_cursor_blink(struct device *device, > > int blink, idx; > > char **last = NULL; > > > > - if (fbcon_has_exited) > > - return count; > > - > > console_lock(); > > idx = con2fb_map[fg_console]; > > > > @@ -3668,9 +3646,6 @@ static void fbcon_exit(void) > > struct fb_info *info; > > int i, j, mapped; > > > > - if (fbcon_has_exited) > > - return; > > - > > #ifdef CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER > > if (deferred_takeover) { > > dummycon_unregister_output_notifier(&fbcon_output_nb); > > @@ -3695,7 +3670,7 @@ static void fbcon_exit(void) > > for (j = first_fb_vc; j <= last_fb_vc; j++) { > > if (con2fb_map[j] == i) { > > mapped = 1; > > - break; > > + con2fb_map[j] = -1; > > } > > } > > > > @@ -3718,8 +3693,6 @@ static void fbcon_exit(void) > > info->queue.func = NULL; > > } > > } > > - > > - fbcon_has_exited = 1; > > } > > > > void __init fb_console_init(void) > > -- > > 2.20.1 > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch