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 C4D9BC43218 for ; Tue, 11 Jun 2019 14:09:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8D5D0208E3 for ; Tue, 11 Jun 2019 14:09:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="BM/McOe5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390991AbfFKOJf (ORCPT ); Tue, 11 Jun 2019 10:09:35 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:39191 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728264AbfFKOJf (ORCPT ); Tue, 11 Jun 2019 10:09:35 -0400 Received: by mail-wr1-f68.google.com with SMTP id x4so10565605wrt.6 for ; Tue, 11 Jun 2019 07:09:33 -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:in-reply-to:user-agent; bh=chG44qVadtG27sXCWyabcWh6AvGr1QJ5aOEt3de4cR8=; b=BM/McOe5ikITon3862u//tmcOfBhtceNTcDdFhqHvW7VmMEFW2JQz7Ssphr0x5m9qj Sn+4hD4m42WqvY8u0pR+L51GwFoHi/g47a2qeG2FGChC/LTSplh/vs45m0qk4neKQpBJ nxSNVmIpvB0oR0rGZm9d/h7Tj3C1mwETHMTpnfE/zQZKrQeXgyDQBzYdn5JlTyLyv6Ex 5mT0EQh0pxfvcBTGMUavzIbLGrQ8zj+igWYN/xoKG8SIhE58829hVyr1tLtaicVAguCh uOn6CvSxFzrewUZ/NywP4hLLxNcNxdP9y1bQzdbQkDJz4eaFEc/3+BKmgO7B5iuWrfUL BRFA== 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:in-reply-to:user-agent; bh=chG44qVadtG27sXCWyabcWh6AvGr1QJ5aOEt3de4cR8=; b=LmebDr/N0AL7Z2pdfCLOC3ydXFY3sPsqQa4BQ5bBf12mTLohijnMUXsPiOE8GrYIYb 92y0rzdSFhsO6LMIW30OEuz13joOQ9Qnrfu9jOF51TiTYzGFcQsmKS3OfePsKzceIRK0 GNEhfm0gLYDTrwWDO5Vu19QTp0L7QNhkhSGXegGUQyLAlJKXxKZ5QsEI3PZmNBpcenkz OecM021U5RcFq24FpQUq5EKT81SFNDYxHUq4lU3IpL7pNiBfcTs0xscmgj8AR3Lp6jfJ JxlWHfl47a9LCE4a8efxJrZhxwE3HCz3MSfhArJfEuz3SMqCmsjtRviNjCKvAlHhofoN sOdQ== X-Gm-Message-State: APjAAAXXtzt5pO077kQQBJXqWZQuRD9PKhUPqRGQ5PvNzKoeBgLm0qV8 /RmJz81c+Ea4D1AWEZ9awZGf7Q== X-Google-Smtp-Source: APXvYqyFbgo/dzYWbpnEL2mTyyd6+ES297QBazL6BuG5v8+gnIqtK8cr9BugTbmf2pSIes19X5UXSw== X-Received: by 2002:a5d:680a:: with SMTP id w10mr30674974wru.42.1560262172583; Tue, 11 Jun 2019 07:09:32 -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 s8sm24113685wra.55.2019.06.11.07.09.31 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 11 Jun 2019 07:09:31 -0700 (PDT) Date: Tue, 11 Jun 2019 15:09:29 +0100 From: Daniel Thompson To: Daniel Vetter Cc: LKML , DRI Development , Intel Graphics Development , linux-fbdev@vger.kernel.org, Bartlomiej Zolnierkiewicz , Richard Purdie , Daniel Vetter , Sam Ravnborg , Maarten Lankhorst , Lee Jones , Jingoo Han , Hans de Goede , Yisheng Xie Subject: Re: [PATCH 24/33] Revert "backlight/fbcon: Add FB_EVENT_CONBLANK" Message-ID: <20190611140929.ufkz3rz3pjw75qgy@holly.lan> References: <20190528090304.9388-1-daniel.vetter@ffwll.ch> <20190528090304.9388-25-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190528090304.9388-25-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:55AM +0200, Daniel Vetter wrote: > This reverts commit 994efacdf9a087b52f71e620b58dfa526b0cf928. > > The justification is that if hw blanking fails (i.e. fbops->fb_blank) > fails, then we still want to shut down the backlight. Which is exactly > _not_ what fb_blank() does and so rather inconsistent if we end up > with different behaviour between fbcon and direct fbdev usage. Given > that the entire notifier maze is getting in the way anyway I figured > it's simplest to revert this not well justified commit. > > v2: Add static inline to the dummy version. > > Cc: Richard Purdie > Signed-off-by: Daniel Vetter > Reviewed-by: Sam Ravnborg > Reviewed-by: 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: linux-fbdev@vger.kernel.org This was the main patch where I wanted the bigger picture ;-) and TBH I'm still in two minds here. I don't personally view fbcon as inconsistent, more that, as an in-kernel service it might have to do more that something more complicated than freak out and let userspace decide what to do next. However... since I'm struggling to make up my mind, I can't think of many products that would ship reliant exclusively on fbcon *and* this patch is more about fbcon than backlight then I figure that, from a backlight perspective: Acked-by: Daniel Thompson Daniel. > --- > drivers/video/backlight/backlight.c | 2 +- > drivers/video/fbdev/core/fbcon.c | 14 +------------- > drivers/video/fbdev/core/fbmem.c | 1 + > include/linux/fb.h | 4 +--- > include/linux/fbcon.h | 2 ++ > 5 files changed, 6 insertions(+), 17 deletions(-) > > diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c > index 1ef8b6fd62ac..5dc07106a59e 100644 > --- a/drivers/video/backlight/backlight.c > +++ b/drivers/video/backlight/backlight.c > @@ -47,7 +47,7 @@ static int fb_notifier_callback(struct notifier_block *self, > int fb_blank = 0; > > /* If we aren't interested in this event, skip it immediately ... */ > - if (event != FB_EVENT_BLANK && event != FB_EVENT_CONBLANK) > + if (event != FB_EVENT_BLANK) > return 0; > > bd = container_of(self, struct backlight_device, fb_notif); > diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c > index ef69bd4ad343..a4617067ff24 100644 > --- a/drivers/video/fbdev/core/fbcon.c > +++ b/drivers/video/fbdev/core/fbcon.c > @@ -2350,8 +2350,6 @@ static int fbcon_switch(struct vc_data *vc) > static void fbcon_generic_blank(struct vc_data *vc, struct fb_info *info, > int blank) > { > - struct fb_event event; > - > if (blank) { > unsigned short charmask = vc->vc_hi_font_mask ? > 0x1ff : 0xff; > @@ -2362,13 +2360,6 @@ static void fbcon_generic_blank(struct vc_data *vc, struct fb_info *info, > fbcon_clear(vc, 0, 0, vc->vc_rows, vc->vc_cols); > vc->vc_video_erase_char = oldc; > } > - > - > - lock_fb_info(info); > - event.info = info; > - event.data = ␣ > - fb_notifier_call_chain(FB_EVENT_CONBLANK, &event); > - unlock_fb_info(info); > } > > static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch) > @@ -3240,7 +3231,7 @@ int fbcon_fb_registered(struct fb_info *info) > return ret; > } > > -static void fbcon_fb_blanked(struct fb_info *info, int blank) > +void fbcon_fb_blanked(struct fb_info *info, int blank) > { > struct fbcon_ops *ops = info->fbcon_par; > struct vc_data *vc; > @@ -3344,9 +3335,6 @@ static int fbcon_event_notify(struct notifier_block *self, > con2fb = event->data; > con2fb->framebuffer = con2fb_map[con2fb->console - 1]; > break; > - case FB_EVENT_BLANK: > - fbcon_fb_blanked(info, *(int *)event->data); > - break; > case FB_EVENT_REMAP_ALL_CONSOLE: > idx = info->node; > fbcon_remap_all(idx); > diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c > index ddc0c16b8bbf..9366fbe99a58 100644 > --- a/drivers/video/fbdev/core/fbmem.c > +++ b/drivers/video/fbdev/core/fbmem.c > @@ -1068,6 +1068,7 @@ fb_blank(struct fb_info *info, int blank) > event.data = ␣ > > early_ret = fb_notifier_call_chain(FB_EARLY_EVENT_BLANK, &event); > + fbcon_fb_blanked(info, blank); > > if (info->fbops->fb_blank) > ret = info->fbops->fb_blank(blank, info); > diff --git a/include/linux/fb.h b/include/linux/fb.h > index 0d86aa31bf8d..1e66fac3124f 100644 > --- a/include/linux/fb.h > +++ b/include/linux/fb.h > @@ -137,12 +137,10 @@ struct fb_cursor_user { > #define FB_EVENT_GET_CONSOLE_MAP 0x07 > /* CONSOLE-SPECIFIC: set console to framebuffer mapping */ > #define FB_EVENT_SET_CONSOLE_MAP 0x08 > -/* A hardware display blank change occurred */ > +/* A display blank is requested */ > #define FB_EVENT_BLANK 0x09 > /* Private modelist is to be replaced */ > #define FB_EVENT_MODE_CHANGE_ALL 0x0B > -/* A software display blank change occurred */ > -#define FB_EVENT_CONBLANK 0x0C > /* 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 305e4f2eddac..d67d7ec51ef9 100644 > --- a/include/linux/fbcon.h > +++ b/include/linux/fbcon.h > @@ -14,6 +14,7 @@ int fbcon_mode_deleted(struct fb_info *info, > 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); > #else > static inline void fb_console_init(void) {} > static inline void fb_console_exit(void) {} > @@ -27,6 +28,7 @@ static inline int fbcon_mode_deleted(struct fb_info *info, > 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) {} > #endif > > #endif /* _LINUX_FBCON_H */ > -- > 2.20.1 >