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.5 required=3.0 tests=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 DACEAC46460 for ; Sat, 25 May 2019 15:40:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BE4F62168B for ; Sat, 25 May 2019 15:40:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727121AbfEYPid (ORCPT ); Sat, 25 May 2019 11:38:33 -0400 Received: from asavdk3.altibox.net ([109.247.116.14]:41204 "EHLO asavdk3.altibox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726971AbfEYPic (ORCPT ); Sat, 25 May 2019 11:38:32 -0400 Received: from ravnborg.org (unknown [158.248.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by asavdk3.altibox.net (Postfix) with ESMTPS id 8CEE0200EF; Sat, 25 May 2019 17:38:27 +0200 (CEST) Date: Sat, 25 May 2019 17:38:26 +0200 From: Sam Ravnborg To: Daniel Vetter Cc: 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: <20190525153826.GA8661@ravnborg.org> References: <20190524085354.27411-1-daniel.vetter@ffwll.ch> <20190524085354.27411-10-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190524085354.27411-10-daniel.vetter@ffwll.ch> User-Agent: Mutt/1.10.1 (2018-07-13) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=dqr19Wo4 c=1 sm=1 tr=0 a=UWs3HLbX/2nnQ3s7vZ42gw==:117 a=UWs3HLbX/2nnQ3s7vZ42gw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=e5mUnYsNAAAA:8 a=DzVgexfn9IsVGKuEcHIA:9 a=mS0BKyo6H8Xd97p-:21 a=5wqHtdtA96AT7Bqp:21 a=CjuIK1q_8ugA:10 a=Vxmtnl_E_bksehYqCbjh:22 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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. 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Ravnborg Subject: Re: [PATCH 09/33] fbcon: Remove fbcon_has_exited Date: Sat, 25 May 2019 17:38:26 +0200 Message-ID: <20190525153826.GA8661@ravnborg.org> References: <20190524085354.27411-1-daniel.vetter@ffwll.ch> <20190524085354.27411-10-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20190524085354.27411-10-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Daniel Vetter Cc: Prarit Bhargava , Kees Cook , Bartlomiej Zolnierkiewicz , Intel Graphics Development , LKML , DRI Development , Yisheng Xie , Daniel Vetter , Konstantin Khorenko List-Id: dri-devel@lists.freedesktop.org SGkgRGFuaWVsLgoKT25lIGRldGFpbCBJIG5vdGljZWQgd2hpbGUgYnJvc2luZyB0aGUgY2hhbmdl cy4KCj4gIAo+IEBAIC0xMDY0LDkgKzEwNjIsMTMgQEAgc3RhdGljIHZvaWQgZmJjb25faW5pdChz dHJ1Y3QgdmNfZGF0YSAqdmMsIGludCBpbml0KQo+ICAJaW50IGxvZ28gPSAxLCBuZXdfcm93cywg bmV3X2NvbHMsIHJvd3MsIGNvbHMsIGNoYXJjbnQgPSAyNTY7Cj4gIAlpbnQgY2FwLCByZXQ7Cj4g IAo+IC0JaWYgKGluZm9faWR4ID09IC0xIHx8IGluZm8gPT0gTlVMTCkKPiArCWlmIChXQVJOX09O KGluZm9faWR4ID09IC0xKSkKPiAgCSAgICByZXR1cm47Cj4gIAo+ICsJaWYgKGNvbjJmYl9tYXBb dmMtPnZjX251bV0gPT0gLTEpCj4gKwkJY29uMmZiX21hcFt2Yy0+dmNfbnVtXSA9IGluZm9faWR4 Owo+ICsKPiArCWluZm8gPSByZWdpc3RlcmVkX2ZiW2NvbjJmYl9tYXBbdmMtPnZjX251bV1dOwo+ ICAJY2FwID0gaW5mby0+ZmxhZ3M7CgpXaGVuIGluZm8gaXMgZGVmaW5lZCBpdCBpcyBhbHNvIGFz c2lnbmVkOgpzdHJ1Y3QgZmJfaW5mbyAqaW5mbyA9IHJlZ2lzdGVyZWRfZmJbY29uMmZiX21hcFt2 Yy0+dmNfbnVtXV07CgpBcyB0aGUgdGVzdCBmb3IgaW5mbyBpcyBnb25lIHRoaXMgYXNzaWdubWVu dCBpcyBubyBsb25nZXIKcmVxdXJpcmVkIGFuZCBjYW4gYmUgZGVsZXRlZC4KClRoZSBjb2RlIG5v dyBhc3N1bWVzIHRoYXQgdGhlcmUgaXMgYWx3YXlzIGFuIGZiX2luZm8gaWYgY29uMmZiX21hcFtd CmlzIG5vdCBzZXQgdG8gLTEuIEkgY291bGQgbm90IGRldGVybWluZSBpZiB0aGlzIGlzIE9LLCBi dXQgdGhpcwpsaWtlbHkgYm9pbHMgZG93biB0byB5b3VyIGxvY2tpbmcgY29uY2VybiBvZiByZWdp c3RlcmVkX2ZiLgoKCVNhbQoKPiAgCj4gIAlpZiAobG9nb19zaG93biA8IDAgJiYgY29uc29sZV9s b2dsZXZlbCA8PSBDT05TT0xFX0xPR0xFVkVMX1FVSUVUKQo+IEBAIC0zMzM2LDE0ICszMzM4LDYg QEAgc3RhdGljIGludCBmYmNvbl9ldmVudF9ub3RpZnkoc3RydWN0IG5vdGlmaWVyX2Jsb2NrICpz ZWxmLAo+ICAJc3RydWN0IGZiX2JsaXRfY2FwcyAqY2FwczsKPiAgCWludCBpZHgsIHJldCA9IDA7 Cj4gIAo+IC0JLyoKPiAtCSAqIGlnbm9yZSBhbGwgZXZlbnRzIGV4Y2VwdCBkcml2ZXIgcmVnaXN0 cmF0aW9uIGFuZCBkZXJlZ2lzdHJhdGlvbgo+IC0JICogaWYgZmJjb24gaXMgbm90IGFjdGl2ZQo+ IC0JICovCj4gLQlpZiAoZmJjb25faGFzX2V4aXRlZCAmJiAhKGFjdGlvbiA9PSBGQl9FVkVOVF9G Ql9SRUdJU1RFUkVEIHx8Cj4gLQkJCQkgIGFjdGlvbiA9PSBGQl9FVkVOVF9GQl9VTlJFR0lTVEVS RUQpKQo+IC0JCWdvdG8gZG9uZTsKPiAtCj4gIAlzd2l0Y2goYWN0aW9uKSB7Cj4gIAljYXNlIEZC X0VWRU5UX1NVU1BFTkQ6Cj4gIAkJZmJjb25fc3VzcGVuZGVkKGluZm8pOwo+IEBAIC0zMzk2LDcg KzMzOTAsNiBAQCBzdGF0aWMgaW50IGZiY29uX2V2ZW50X25vdGlmeShzdHJ1Y3Qgbm90aWZpZXJf YmxvY2sgKnNlbGYsCj4gIAkJZmJjb25fcmVtYXBfYWxsKGlkeCk7Cj4gIAkJYnJlYWs7Cj4gIAl9 Cj4gLWRvbmU6Cj4gIAlyZXR1cm4gcmV0Owo+ICB9Cj4gIAo+IEBAIC0zNDQzLDkgKzM0MzYsNiBA QCBzdGF0aWMgc3NpemVfdCBzdG9yZV9yb3RhdGUoc3RydWN0IGRldmljZSAqZGV2aWNlLAo+ICAJ aW50IHJvdGF0ZSwgaWR4Owo+ICAJY2hhciAqKmxhc3QgPSBOVUxMOwo+ICAKPiAtCWlmIChmYmNv bl9oYXNfZXhpdGVkKQo+IC0JCXJldHVybiBjb3VudDsKPiAtCj4gIAljb25zb2xlX2xvY2soKTsK PiAgCWlkeCA9IGNvbjJmYl9tYXBbZmdfY29uc29sZV07Cj4gIAo+IEBAIC0zNDY4LDkgKzM0NTgs NiBAQCBzdGF0aWMgc3NpemVfdCBzdG9yZV9yb3RhdGVfYWxsKHN0cnVjdCBkZXZpY2UgKmRldmlj ZSwKPiAgCWludCByb3RhdGUsIGlkeDsKPiAgCWNoYXIgKipsYXN0ID0gTlVMTDsKPiAgCj4gLQlp ZiAoZmJjb25faGFzX2V4aXRlZCkKPiAtCQlyZXR1cm4gY291bnQ7Cj4gLQo+ICAJY29uc29sZV9s b2NrKCk7Cj4gIAlpZHggPSBjb24yZmJfbWFwW2ZnX2NvbnNvbGVdOwo+ICAKPiBAQCAtMzQ5MSw5 ICszNDc4LDYgQEAgc3RhdGljIHNzaXplX3Qgc2hvd19yb3RhdGUoc3RydWN0IGRldmljZSAqZGV2 aWNlLAo+ICAJc3RydWN0IGZiX2luZm8gKmluZm87Cj4gIAlpbnQgcm90YXRlID0gMCwgaWR4Owo+ ICAKPiAtCWlmIChmYmNvbl9oYXNfZXhpdGVkKQo+IC0JCXJldHVybiAwOwo+IC0KPiAgCWNvbnNv bGVfbG9jaygpOwo+ICAJaWR4ID0gY29uMmZiX21hcFtmZ19jb25zb2xlXTsKPiAgCj4gQEAgLTM1 MTQsOSArMzQ5OCw2IEBAIHN0YXRpYyBzc2l6ZV90IHNob3dfY3Vyc29yX2JsaW5rKHN0cnVjdCBk ZXZpY2UgKmRldmljZSwKPiAgCXN0cnVjdCBmYmNvbl9vcHMgKm9wczsKPiAgCWludCBpZHgsIGJs aW5rID0gLTE7Cj4gIAo+IC0JaWYgKGZiY29uX2hhc19leGl0ZWQpCj4gLQkJcmV0dXJuIDA7Cj4g LQo+ICAJY29uc29sZV9sb2NrKCk7Cj4gIAlpZHggPSBjb24yZmJfbWFwW2ZnX2NvbnNvbGVdOwo+ ICAKPiBAQCAtMzU0Myw5ICszNTI0LDYgQEAgc3RhdGljIHNzaXplX3Qgc3RvcmVfY3Vyc29yX2Js aW5rKHN0cnVjdCBkZXZpY2UgKmRldmljZSwKPiAgCWludCBibGluaywgaWR4Owo+ICAJY2hhciAq Kmxhc3QgPSBOVUxMOwo+ICAKPiAtCWlmIChmYmNvbl9oYXNfZXhpdGVkKQo+IC0JCXJldHVybiBj b3VudDsKPiAtCj4gIAljb25zb2xlX2xvY2soKTsKPiAgCWlkeCA9IGNvbjJmYl9tYXBbZmdfY29u c29sZV07Cj4gIAo+IEBAIC0zNjY4LDkgKzM2NDYsNiBAQCBzdGF0aWMgdm9pZCBmYmNvbl9leGl0 KHZvaWQpCj4gIAlzdHJ1Y3QgZmJfaW5mbyAqaW5mbzsKPiAgCWludCBpLCBqLCBtYXBwZWQ7Cj4g IAo+IC0JaWYgKGZiY29uX2hhc19leGl0ZWQpCj4gLQkJcmV0dXJuOwo+IC0KPiAgI2lmZGVmIENP TkZJR19GUkFNRUJVRkZFUl9DT05TT0xFX0RFRkVSUkVEX1RBS0VPVkVSCj4gIAlpZiAoZGVmZXJy ZWRfdGFrZW92ZXIpIHsKPiAgCQlkdW1teWNvbl91bnJlZ2lzdGVyX291dHB1dF9ub3RpZmllcigm ZmJjb25fb3V0cHV0X25iKTsKPiBAQCAtMzY5NSw3ICszNjcwLDcgQEAgc3RhdGljIHZvaWQgZmJj b25fZXhpdCh2b2lkKQo+ICAJCWZvciAoaiA9IGZpcnN0X2ZiX3ZjOyBqIDw9IGxhc3RfZmJfdmM7 IGorKykgewo+ICAJCQlpZiAoY29uMmZiX21hcFtqXSA9PSBpKSB7Cj4gIAkJCQltYXBwZWQgPSAx Owo+IC0JCQkJYnJlYWs7Cj4gKwkJCQljb24yZmJfbWFwW2pdID0gLTE7Cj4gIAkJCX0KPiAgCQl9 Cj4gIAo+IEBAIC0zNzE4LDggKzM2OTMsNiBAQCBzdGF0aWMgdm9pZCBmYmNvbl9leGl0KHZvaWQp Cj4gIAkJCQlpbmZvLT5xdWV1ZS5mdW5jID0gTlVMTDsKPiAgCQl9Cj4gIAl9Cj4gLQo+IC0JZmJj b25faGFzX2V4aXRlZCA9IDE7Cj4gIH0KPiAgCj4gIHZvaWQgX19pbml0IGZiX2NvbnNvbGVfaW5p dCh2b2lkKQo+IC0tIAo+IDIuMjAuMQo+IAo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCj4gZHJpLWRldmVsIG1haWxpbmcgbGlzdAo+IGRyaS1kZXZlbEBs aXN0cy5mcmVlZGVza3RvcC5vcmcKPiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWls bWFuL2xpc3RpbmZvL2RyaS1kZXZlbApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9pbnRlbC1nZng=