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=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_NEOMUTT 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 05674C43218 for ; Tue, 11 Jun 2019 14:11:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC4D120652 for ; Tue, 11 Jun 2019 14:11:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="r5ZTklkH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388676AbfFKOLE (ORCPT ); Tue, 11 Jun 2019 10:11:04 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:37342 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387486AbfFKOLE (ORCPT ); Tue, 11 Jun 2019 10:11:04 -0400 Received: by mail-wr1-f66.google.com with SMTP id v14so13213874wrr.4 for ; Tue, 11 Jun 2019 07:11:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=Ehi+H9kQbguCo+MlZDy+3obu3hiLkhqNmfQx4sj3WM4=; b=r5ZTklkHYG460KgbQQD+kWiHw4TyH3ambLi83yX86jVz0K+x5wmcmK2hFHuvXFnkWT 5PuGQ+xHvgIzVgUajy06VFNH0Ri2Bw1TDCLio1r1pgjUCkwSs/vLaqxijYgB/ri89RnO VrhnIiQBMGCe1UMMCIa4MgL0TTYrcNRtaAWitZrdeqI5QGOl5UmkUm3HS2cXEW1QF6Fb qLU8l13gXROeQ01EUmiH0ubOD+QfOFuXedicQSpXRUP+NVCep8MYCDgcdbitHDOl2g4x 89tmPgjp4qstYErFICR/MRHgG3+gpRClZlg0oXXYvzSJiRxVZdIydfiSfWAUoZFvYzIF lzog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=Ehi+H9kQbguCo+MlZDy+3obu3hiLkhqNmfQx4sj3WM4=; b=RW7iKdcc8So4zcfdcMRlgJgoR2UFPwLjWRnlr/4xyiF6WUYBdv7pEYccqW0DM5nmFj nmBLbfydnUnGwlyLDk1A+yBZpqM1MnTBf2QbuSfKqoJUiDcrWDwElxS+LexdXgfbWfeg 4snsRAO7DKH/CJ7ovaTAKHsrEqJVl+kzM6m6CDTGpWqe2C4FPaAo/iyuY3U5FVMlWMAo 4w0lu2wvXe4zqZ2Hh4NYEDl8ijK1bgiH+DwbA8OP4Nf4CdmUOKALFIQ9kuPUDEB4QPym vx6XynPuyDpnwdHWzLLYD/zy2jQMau7Re0TZkm+ZslfkYtmQ8bNnPZDfVpLag8SODq0I iR9Q== X-Gm-Message-State: APjAAAUDZJaXp9jmTXqmH9FkxQSMfLCDOjOfDAklhmHzRGQMSDMNJ84W vG7PHnga+I2IlWp36F2iJqO0cA== X-Google-Smtp-Source: APXvYqxDR8UvMEWereRNtTq+DUW79gf+2h83x/tnxgDqHPr0hpnt3G3XqW5C9XwtdrkSTIg5B3xIaA== X-Received: by 2002:adf:e40f:: with SMTP id g15mr5876041wrm.174.1560262262323; Tue, 11 Jun 2019 07:11:02 -0700 (PDT) Received: from holly.lan (cpc141214-aztw34-2-0-cust773.18-1.cable.virginm.net. [86.9.19.6]) by smtp.gmail.com with ESMTPSA id k82sm1697009wma.15.2019.06.11.07.11.01 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 11 Jun 2019 07:11:01 -0700 (PDT) Date: Tue, 11 Jun 2019 15:11:00 +0100 From: Daniel Thompson To: Daniel Vetter Cc: LKML , DRI Development , Intel Graphics Development , linux-fbdev@vger.kernel.org, Bartlomiej Zolnierkiewicz , Sam Ravnborg , Daniel Vetter , Maarten Lankhorst , Lee Jones , Jingoo Han , Hans de Goede , Yisheng Xie , =?utf-8?B?TWljaGHFgiBNaXJvc8WCYXc=?= , Peter Rosin , Mikulas Patocka Subject: Re: [PATCH 28/33] fbcon: replace FB_EVENT_MODE_CHANGE/_ALL with direct calls Message-ID: <20190611141100.wdcnzvsxobvh5jxr@holly.lan> References: <20190528090304.9388-1-daniel.vetter@ffwll.ch> <20190528090304.9388-29-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20190528090304.9388-29-daniel.vetter@ffwll.ch> User-Agent: NeoMutt/20180716 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 28, 2019 at 11:02:59AM +0200, Daniel Vetter wrote: > Create a new wrapper function for this, feels like there's some > refactoring room here between the two modes. > > v2: backlight notifier is also interested in the mode change event, > it calls lcd->set_mode, of which there are 3 implementations. Thanks > to Maarten for spotting this. So we keep that. We can ditch the differentiation > between mode change and all mode changes (because backlight notifier > doesn't care), and we can drop the FBINFO_MISC_USEREVENT stuff too, > because that's just to prevent recursion between fbmem.c and fbcon.c. > > While at it flatten the control flow a bit. > > v3: Need to add a static inline to the dummy function. > > v4: Add missing #include to sh_mob (Sam). > > Cc: Sam Ravnborg > Signed-off-by: Daniel Vetter > Reviewed-by: Sam Ravnborg > Reviewed-by: Maarten Lankhorst > Cc: Maarten Lankhorst > Cc: Lee Jones > Cc: Daniel Thompson > Cc: Jingoo Han > Cc: Bartlomiej Zolnierkiewicz > Cc: Daniel Vetter > Cc: Hans de Goede > Cc: Yisheng Xie > Cc: "Michał Mirosław" > Cc: Peter Rosin > Cc: Mikulas Patocka > Cc: linux-fbdev@vger.kernel.org Acked-by: Daniel Thompson > --- > drivers/video/backlight/lcd.c | 1 - > drivers/video/fbdev/core/fbcon.c | 15 +++++++++------ > drivers/video/fbdev/core/fbmem.c | 21 ++++++++++----------- > drivers/video/fbdev/sh_mobile_lcdcfb.c | 12 ++---------- > include/linux/fb.h | 2 -- > include/linux/fbcon.h | 2 ++ > 6 files changed, 23 insertions(+), 30 deletions(-) > > diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c > index 151b18776add..ecdda06989d0 100644 > --- a/drivers/video/backlight/lcd.c > +++ b/drivers/video/backlight/lcd.c > @@ -34,7 +34,6 @@ static int fb_notifier_callback(struct notifier_block *self, > switch (event) { > case FB_EVENT_BLANK: > case FB_EVENT_MODE_CHANGE: > - case FB_EVENT_MODE_CHANGE_ALL: > case FB_EARLY_EVENT_BLANK: > case FB_R_EARLY_EVENT_BLANK: > break; > diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c > index b5ee89f16d6c..e98551f96138 100644 > --- a/drivers/video/fbdev/core/fbcon.c > +++ b/drivers/video/fbdev/core/fbcon.c > @@ -3009,6 +3009,15 @@ static void fbcon_set_all_vcs(struct fb_info *info) > fbcon_modechanged(info); > } > > + > +void fbcon_update_vcs(struct fb_info *info, bool all) > +{ > + if (all) > + fbcon_set_all_vcs(info); > + else > + fbcon_modechanged(info); > +} > + > int fbcon_mode_deleted(struct fb_info *info, > struct fb_videomode *mode) > { > @@ -3318,12 +3327,6 @@ static int fbcon_event_notify(struct notifier_block *self, > int idx, ret = 0; > > switch(action) { > - case FB_EVENT_MODE_CHANGE: > - fbcon_modechanged(info); > - break; > - case FB_EVENT_MODE_CHANGE_ALL: > - fbcon_set_all_vcs(info); > - break; > case FB_EVENT_SET_CONSOLE_MAP: > /* called with console lock held */ > con2fb = event->data; > diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c > index 96805fe85332..dd1a708df1a7 100644 > --- a/drivers/video/fbdev/core/fbmem.c > +++ b/drivers/video/fbdev/core/fbmem.c > @@ -957,6 +957,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) > u32 activate; > struct fb_var_screeninfo old_var; > struct fb_videomode mode; > + struct fb_event event; > > if (var->activate & FB_ACTIVATE_INV_MODE) { > struct fb_videomode mode1, mode2; > @@ -1039,19 +1040,17 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) > !list_empty(&info->modelist)) > ret = fb_add_videomode(&mode, &info->modelist); > > - if (!ret && (flags & FBINFO_MISC_USEREVENT)) { > - struct fb_event event; > - int evnt = (activate & FB_ACTIVATE_ALL) ? > - FB_EVENT_MODE_CHANGE_ALL : > - FB_EVENT_MODE_CHANGE; > + if (ret) > + return ret; > > - info->flags &= ~FBINFO_MISC_USEREVENT; > - event.info = info; > - event.data = &mode; > - fb_notifier_call_chain(evnt, &event); > - } > + event.info = info; > + event.data = &mode; > + fb_notifier_call_chain(FB_EVENT_MODE_CHANGE, &event); > > - return ret; > + if (flags & FBINFO_MISC_USEREVENT) > + fbcon_update_vcs(info, activate & FB_ACTIVATE_ALL); > + > + return 0; > } > EXPORT_SYMBOL(fb_set_var); > > diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c > index 015a02a29d37..b8454424910d 100644 > --- a/drivers/video/fbdev/sh_mobile_lcdcfb.c > +++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -1757,8 +1758,6 @@ static void sh_mobile_fb_reconfig(struct fb_info *info) > struct sh_mobile_lcdc_chan *ch = info->par; > struct fb_var_screeninfo var; > struct fb_videomode mode; > - struct fb_event event; > - int evnt = FB_EVENT_MODE_CHANGE_ALL; > > if (ch->use_count > 1 || (ch->use_count == 1 && !info->fbcon_par)) > /* More framebuffer users are active */ > @@ -1780,14 +1779,7 @@ static void sh_mobile_fb_reconfig(struct fb_info *info) > /* Couldn't reconfigure, hopefully, can continue as before */ > return; > > - /* > - * fb_set_var() calls the notifier change internally, only if > - * FBINFO_MISC_USEREVENT flag is set. Since we do not want to fake a > - * user event, we have to call the chain ourselves. > - */ > - event.info = info; > - event.data = &ch->display.mode; > - fb_notifier_call_chain(evnt, &event); > + fbcon_update_vcs(info, true); > } > > /* > diff --git a/include/linux/fb.h b/include/linux/fb.h > index 1e66fac3124f..f9c212f9b661 100644 > --- a/include/linux/fb.h > +++ b/include/linux/fb.h > @@ -139,8 +139,6 @@ struct fb_cursor_user { > #define FB_EVENT_SET_CONSOLE_MAP 0x08 > /* A display blank is requested */ > #define FB_EVENT_BLANK 0x09 > -/* Private modelist is to be replaced */ > -#define FB_EVENT_MODE_CHANGE_ALL 0x0B > /* CONSOLE-SPECIFIC: remap all consoles to new fb - for vga_switcheroo */ > #define FB_EVENT_REMAP_ALL_CONSOLE 0x0F > /* A hardware display blank early change occurred */ > diff --git a/include/linux/fbcon.h b/include/linux/fbcon.h > index d67d7ec51ef9..de31eeb22c97 100644 > --- a/include/linux/fbcon.h > +++ b/include/linux/fbcon.h > @@ -15,6 +15,7 @@ void fbcon_new_modelist(struct fb_info *info); > void fbcon_get_requirement(struct fb_info *info, > struct fb_blit_caps *caps); > void fbcon_fb_blanked(struct fb_info *info, int blank); > +void fbcon_update_vcs(struct fb_info *info, bool all); > #else > static inline void fb_console_init(void) {} > static inline void fb_console_exit(void) {} > @@ -29,6 +30,7 @@ static inline void fbcon_new_modelist(struct fb_info *info) {} > static inline void fbcon_get_requirement(struct fb_info *info, > struct fb_blit_caps *caps) {} > static inline void fbcon_fb_blanked(struct fb_info *info, int blank) {} > +static inline void fbcon_update_vcs(struct fb_info *info, bool all) {} > #endif > > #endif /* _LINUX_FBCON_H */ > -- > 2.20.1 >