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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3980C433F5 for ; Tue, 8 Feb 2022 13:54:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350887AbiBHNyE (ORCPT ); Tue, 8 Feb 2022 08:54:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233604AbiBHNyE (ORCPT ); Tue, 8 Feb 2022 08:54:04 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A234C03FED0 for ; Tue, 8 Feb 2022 05:54:03 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id w11so30911232wra.4 for ; Tue, 08 Feb 2022 05:54:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=4O7t+VO/eUKPV3zCNKFSbvq0Ljp3XWU8Qf/HjmcbkEc=; b=gnx0wctQF0ZOrloVcj5vzxR/MoXGQ5grkToQFc0SpnV2toiN0RcEU0b0Joz5mj4Uz1 aoQNEtoZVQWUxi5PJcDDd+IJmgG3zUT40M1A6XASvbF1bwhM1Tyd+B7c5s4K+rgh3g1m H0laAeLoROpuVYCKj2hPvYin3DylTSujPrm5M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=4O7t+VO/eUKPV3zCNKFSbvq0Ljp3XWU8Qf/HjmcbkEc=; b=cjldVIT0gnG8xfyUvO0pDbEBnedCtzbE9Gasbma21cGHu4l9SWcZbsMkt/0HnoS2AD SatMd4uktJph7KEXtoRtOKfTA0Rh/foDDhzDV0yPP2gQDn4+pzz3DcINCcEy8u2qlBC7 EQiYkkUGHjcVqli38ak6d8NlWAvz0JxeIyE5K4ursl5ZaLMTWAsNqWYqmKW125A53V6v 9rjfxsO6KaBrhzjHgifeJxAh3Vg5ttJC87kc/5t2kQpqmOPE7fT7J6VvEP4hiBXz3TAt /bzcSC6g4V0RCTK7gq0phOx1XTWvjFTXWzSWNrjYLryBk7cgL88Pdpxle6EGaKTGSGVB bXmg== X-Gm-Message-State: AOAM532PYlArpY1Zh9i2f6cQgCMLspAa+zH20/MacVQeJXrm+mw34gQh tT3JnZSHUM9jmuKSHwX0NMgWJg== X-Google-Smtp-Source: ABdhPJwtMvoSlZ1zJLr+xk0DKI6HZ/HhJrH76WUKQbFlTNz3OgcD8QA8YxnqOWoVUYW/4bYjDOFLTg== X-Received: by 2002:adf:de12:: with SMTP id b18mr3660421wrm.293.1644328441602; Tue, 08 Feb 2022 05:54:01 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id bg23sm2829083wmb.5.2022.02.08.05.54.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 05:54:00 -0800 (PST) Date: Tue, 8 Feb 2022 14:53:59 +0100 From: Daniel Vetter To: Sam Ravnborg Cc: Daniel Vetter , DRI Development , linux-fbdev@vger.kernel.org, Thomas Zimmermann , Du Cheng , Tetsuo Handa , Intel Graphics Development , LKML , Claudio Suarez , Greg Kroah-Hartman , Daniel Vetter Subject: Re: [PATCH 13/21] fbcon: move more common code into fb_open() Message-ID: Mail-Followup-To: Sam Ravnborg , DRI Development , linux-fbdev@vger.kernel.org, Thomas Zimmermann , Du Cheng , Tetsuo Handa , Intel Graphics Development , LKML , Claudio Suarez , Greg Kroah-Hartman , Daniel Vetter References: <20220131210552.482606-1-daniel.vetter@ffwll.ch> <20220131210552.482606-14-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Operating-System: Linux phenom 5.10.0-8-amd64 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org On Fri, Feb 04, 2022 at 08:35:31PM +0100, Sam Ravnborg wrote: > On Mon, Jan 31, 2022 at 10:05:44PM +0100, Daniel Vetter wrote: > > No idea why con2fb_acquire_newinfo() initializes much less than > > fbcon_startup(), but so be it. From a quick look most of the > > un-initialized stuff should be fairly harmless, but who knows. > > > > Signed-off-by: Daniel Vetter > > Cc: Daniel Vetter > > Cc: Greg Kroah-Hartman > > Cc: Tetsuo Handa > > Cc: Thomas Zimmermann > > Cc: Claudio Suarez > > Cc: Du Cheng > > --- > > drivers/video/fbdev/core/fbcon.c | 74 +++++++++++++------------------- > > 1 file changed, 31 insertions(+), 43 deletions(-) > > > > diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c > > index b83a5a77d8a8..5a3391ff038d 100644 > > --- a/drivers/video/fbdev/core/fbcon.c > > +++ b/drivers/video/fbdev/core/fbcon.c > > @@ -680,8 +680,18 @@ static int fbcon_invalid_charcount(struct fb_info *info, unsigned charcount) > > > > #endif /* CONFIG_MISC_TILEBLITTING */ > > > > +static void fbcon_release(struct fb_info *info) > > +{ > > + if (info->fbops->fb_release) > > + info->fbops->fb_release(info, 0); > > + > > + module_put(info->fbops->owner); > > +} > > + > > static int fbcon_open(struct fb_info *info) > > { > > + struct fbcon_ops *ops; > > + > > if (!try_module_get(info->fbops->owner)) > > return -ENODEV; > > > > @@ -691,19 +701,22 @@ static int fbcon_open(struct fb_info *info) > > return -ENODEV; > > } > > > > - return 0; > > -} > > + ops = kzalloc(sizeof(struct fbcon_ops), GFP_KERNEL); > > + if (!ops) { > > + fbcon_release(info); > > + return -ENOMEM; > > + } > > > > -static void fbcon_release(struct fb_info *info) > > -{ > > - if (info->fbops->fb_release) > > - info->fbops->fb_release(info, 0); > > + INIT_DELAYED_WORK(&ops->cursor_work, fb_flashcursor); > > + ops->info = info; > > + info->fbcon_par = ops; > > + ops->cur_blink_jiffies = HZ / 5; > > > > - module_put(info->fbops->owner); > > + return 0; > > } > > > > static int con2fb_acquire_newinfo(struct vc_data *vc, struct fb_info *info, > > - int unit, int oldidx) > > + int unit) > > { > > struct fbcon_ops *ops = NULL; > > int err; > > @@ -712,27 +725,10 @@ static int con2fb_acquire_newinfo(struct vc_data *vc, struct fb_info *info, > > if (err) > > return err; > > > > - if (!err) { > > - ops = kzalloc(sizeof(struct fbcon_ops), GFP_KERNEL); > > - if (!ops) > > - err = -ENOMEM; > > - > > - INIT_DELAYED_WORK(&ops->cursor_work, fb_flashcursor); > > - } > > - > > - if (!err) { > > - ops->cur_blink_jiffies = HZ / 5; > > - ops->info = info; > > - info->fbcon_par = ops; > > - > > - if (vc) > > - set_blitting_type(vc, info); > > - } > > + ops = info->fbcon_par; > > > > - if (err) { > > - con2fb_map[unit] = oldidx; > > - fbcon_release(info); > > - } > > + if (vc) > > + set_blitting_type(vc, info); > > > > return err; > > } > > @@ -840,9 +836,11 @@ static int set_con2fb_map(int unit, int newidx, int user) > > > > found = search_fb_in_map(newidx); > > > > - con2fb_map[unit] = newidx; > > - if (!err && !found) > > - err = con2fb_acquire_newinfo(vc, info, unit, oldidx); > > + if (!err && !found) { > > + err = con2fb_acquire_newinfo(vc, info, unit); > > + if (!err) > > + con2fb_map[unit] = newidx; > > + } > This looks like an unintentional change of functionality as con2fb_map[unit] is > only assigned when we do a con2fb_acquire_newinfo(). > > Staring at the code I could not say it is wrong, but not nice to hide > the change in this patch. Nope, it's not an unintentional bugfix. The old con2fb_acquire_newinfo did reset con2fb_map to oldidx upon failure, which I've found to be a most bizarre calling convention. So this sorts this out. The reason I smashed this into the same patch is that I had to remove the fbcon_release call, and so the error handling in there looked even more funny. But I indeed failed to explain this all in the commit message. Ack with that explainer, or do you want me to split this out properly? -Daniel > > Sam > > > > > > /* > > * If old fb is not mapped to any of the consoles, > > @@ -939,20 +937,10 @@ static const char *fbcon_startup(void) > > if (fbcon_open(info)) > > return NULL; > > > > - ops = kzalloc(sizeof(struct fbcon_ops), GFP_KERNEL); > > - if (!ops) { > > - fbcon_release(info); > > - return NULL; > > - } > > - > > - INIT_DELAYED_WORK(&ops->cursor_work, fb_flashcursor); > > - > > + ops = info->fbcon_par; > > ops->currcon = -1; > > ops->graphics = 1; > > ops->cur_rotate = -1; > > - ops->cur_blink_jiffies = HZ / 5; > > - ops->info = info; > > - info->fbcon_par = ops; > > > > p->con_rotate = initial_rotation; > > if (p->con_rotate == -1) > > @@ -1022,7 +1010,7 @@ static void fbcon_init(struct vc_data *vc, int init) > > return; > > > > if (!info->fbcon_par) > > - con2fb_acquire_newinfo(vc, info, vc->vc_num, -1); > > + con2fb_acquire_newinfo(vc, info, vc->vc_num); > > > > /* If we are not the first console on this > > fb, copy the font from that console */ > > -- > > 2.33.0 -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch