All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: "Daniel Vetter" <daniel.vetter@ffwll.ch>,
	"DRI Development" <dri-devel@lists.freedesktop.org>,
	"Daniel Thompson" <daniel.thompson@linaro.org>,
	"Bartlomiej Zolnierkiewicz" <b.zolnierkie@samsung.com>,
	"Intel Graphics Development" <intel-gfx@lists.freedesktop.org>,
	LKML <linux-kernel@vger.kernel.org>,
	"Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
	"Yisheng Xie" <ysxie@foxmail.com>,
	"Hans de Goede" <hdegoede@redhat.com>,
	"Mikulas Patocka" <mpatocka@redhat.com>,
	linux-fbdev@vger.kernel.org, "Jingoo Han" <jingoohan1@gmail.com>,
	"Daniel Vetter" <daniel.vetter@intel.com>,
	"Lee Jones" <lee.jones@linaro.org>,
	"Peter Rosin" <peda@axentia.se>
Subject: Re: [PATCH 29/33] fbcon: replace FB_EVENT_MODE_CHANGE/_ALL with direct calls
Date: Tue, 21 May 2019 14:42:59 +0200	[thread overview]
Message-ID: <20190521124259.GN21222@phenom.ffwll.local> (raw)
In-Reply-To: <b91a6f78-43c2-796c-62f1-f84f2973c174@linux.intel.com>

On Tue, May 21, 2019 at 12:56:30PM +0200, Maarten Lankhorst wrote:
> Op 20-05-2019 om 10:22 schreef Daniel Vetter:
> > Create a new wrapper function for this, feels like there's some
> > refactoring room here between the two modes.
> >
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > Cc: Lee Jones <lee.jones@linaro.org>
> > Cc: Daniel Thompson <daniel.thompson@linaro.org>
> > Cc: Jingoo Han <jingoohan1@gmail.com>
> > Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Cc: Hans de Goede <hdegoede@redhat.com>
> > Cc: Yisheng Xie <ysxie@foxmail.com>
> > Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
> > Cc: Peter Rosin <peda@axentia.se>
> > Cc: Mikulas Patocka <mpatocka@redhat.com>
> > Cc: linux-fbdev@vger.kernel.org
> > ---
> >  drivers/video/backlight/lcd.c          |  2 --
> >  drivers/video/fbdev/core/fbcon.c       | 15 +++++++++------
> >  drivers/video/fbdev/core/fbmem.c       | 13 ++-----------
> >  drivers/video/fbdev/sh_mobile_lcdcfb.c | 11 +----------
> >  include/linux/fb.h                     |  4 ----
> >  include/linux/fbcon.h                  |  2 ++
> >  6 files changed, 14 insertions(+), 33 deletions(-)
> >
> > diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
> > index 4b40c6a4d441..16298041b141 100644
> > --- a/drivers/video/backlight/lcd.c
> > +++ b/drivers/video/backlight/lcd.c
> > @@ -32,8 +32,6 @@ static int fb_notifier_callback(struct notifier_block *self,
> >  	/* If we aren't interested in this event, skip it immediately ... */
> >  	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;
> 
> Below it performs a call to set_mode() if it's none of the blanking events; it can be removed. :)

Oops ... I think I'll insert a patch here to create a new MODESET event
for backlights. We still need this one I think (maybe not for kms, but for
old fbdev drivers). And maybe a wrapper for fb_backlight_notify on top ...

Thanks for spotting this.
-Daniel

> 
> > diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
> > index c1a7476e980f..8cc62d340387 100644
> > --- a/drivers/video/fbdev/core/fbcon.c
> > +++ b/drivers/video/fbdev/core/fbcon.c
> > @@ -3005,6 +3005,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)
> >  {
> > @@ -3314,12 +3323,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 cbd58ba8a59d..55b88163edc2 100644
> > --- a/drivers/video/fbdev/core/fbmem.c
> > +++ b/drivers/video/fbdev/core/fbmem.c
> > @@ -1039,17 +1039,8 @@ 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;
> > -
> > -		info->flags &= ~FBINFO_MISC_USEREVENT;
> > -		event.info = info;
> > -		event.data = &mode;
> > -		fb_notifier_call_chain(evnt, &event);
> > -	}
> > +	if (!ret && (flags & FBINFO_MISC_USEREVENT))
> > +		fbcon_update_vcs(info, activate & FB_ACTIVATE_ALL);
> >  
> >  	return ret;
> >  }
> > diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
> > index 0d7a044852d7..bb1a610d0363 100644
> > --- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
> > +++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
> > @@ -1776,8 +1776,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 */
> > @@ -1799,14 +1797,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 4b9b882f8f52..54d6bee09121 100644
> > --- a/include/linux/fb.h
> > +++ b/include/linux/fb.h
> > @@ -124,16 +124,12 @@ struct fb_cursor_user {
> >   * Register/unregister for framebuffer events
> >   */
> >  
> > -/*	The resolution of the passed in fb_info about to change */ 
> > -#define FB_EVENT_MODE_CHANGE		0x01
> >  /*      CONSOLE-SPECIFIC: get console to framebuffer mapping */
> >  #define FB_EVENT_GET_CONSOLE_MAP        0x07
> >  /*      CONSOLE-SPECIFIC: set console to framebuffer mapping */
> >  #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 90e196c835dd..daaa97b0c9e6 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 @@ 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) {}
> >  #endif
> >  
> >  #endif /* _LINUX_FBCON_H */
> 
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

WARNING: multiple messages have this Message-ID
From: Daniel Vetter <daniel@ffwll.ch>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: "Daniel Thompson" <daniel.thompson@linaro.org>,
	"Bartlomiej Zolnierkiewicz" <b.zolnierkie@samsung.com>,
	"Daniel Vetter" <daniel.vetter@ffwll.ch>,
	"Intel Graphics Development" <intel-gfx@lists.freedesktop.org>,
	LKML <linux-kernel@vger.kernel.org>,
	"DRI Development" <dri-devel@lists.freedesktop.org>,
	"Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
	"Yisheng Xie" <ysxie@foxmail.com>,
	"Hans de Goede" <hdegoede@redhat.com>,
	"Mikulas Patocka" <mpatocka@redhat.com>,
	linux-fbdev@vger.kernel.org, "Jingoo Han" <jingoohan1@gmail.com>,
	"Daniel Vetter" <daniel.vetter@intel.com>,
	"Lee Jones" <lee.jones@linaro.org>,
	"Peter Rosin" <peda@axentia.se>
Subject: Re: [PATCH 29/33] fbcon: replace FB_EVENT_MODE_CHANGE/_ALL with direct calls
Date: Tue, 21 May 2019 12:42:59 +0000	[thread overview]
Message-ID: <20190521124259.GN21222@phenom.ffwll.local> (raw)
In-Reply-To: <b91a6f78-43c2-796c-62f1-f84f2973c174@linux.intel.com>

On Tue, May 21, 2019 at 12:56:30PM +0200, Maarten Lankhorst wrote:
> Op 20-05-2019 om 10:22 schreef Daniel Vetter:
> > Create a new wrapper function for this, feels like there's some
> > refactoring room here between the two modes.
> >
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > Cc: Lee Jones <lee.jones@linaro.org>
> > Cc: Daniel Thompson <daniel.thompson@linaro.org>
> > Cc: Jingoo Han <jingoohan1@gmail.com>
> > Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Cc: Hans de Goede <hdegoede@redhat.com>
> > Cc: Yisheng Xie <ysxie@foxmail.com>
> > Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
> > Cc: Peter Rosin <peda@axentia.se>
> > Cc: Mikulas Patocka <mpatocka@redhat.com>
> > Cc: linux-fbdev@vger.kernel.org
> > ---
> >  drivers/video/backlight/lcd.c          |  2 --
> >  drivers/video/fbdev/core/fbcon.c       | 15 +++++++++------
> >  drivers/video/fbdev/core/fbmem.c       | 13 ++-----------
> >  drivers/video/fbdev/sh_mobile_lcdcfb.c | 11 +----------
> >  include/linux/fb.h                     |  4 ----
> >  include/linux/fbcon.h                  |  2 ++
> >  6 files changed, 14 insertions(+), 33 deletions(-)
> >
> > diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
> > index 4b40c6a4d441..16298041b141 100644
> > --- a/drivers/video/backlight/lcd.c
> > +++ b/drivers/video/backlight/lcd.c
> > @@ -32,8 +32,6 @@ static int fb_notifier_callback(struct notifier_block *self,
> >  	/* If we aren't interested in this event, skip it immediately ... */
> >  	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;
> 
> Below it performs a call to set_mode() if it's none of the blanking events; it can be removed. :)

Oops ... I think I'll insert a patch here to create a new MODESET event
for backlights. We still need this one I think (maybe not for kms, but for
old fbdev drivers). And maybe a wrapper for fb_backlight_notify on top ...

Thanks for spotting this.
-Daniel

> 
> > diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
> > index c1a7476e980f..8cc62d340387 100644
> > --- a/drivers/video/fbdev/core/fbcon.c
> > +++ b/drivers/video/fbdev/core/fbcon.c
> > @@ -3005,6 +3005,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)
> >  {
> > @@ -3314,12 +3323,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 cbd58ba8a59d..55b88163edc2 100644
> > --- a/drivers/video/fbdev/core/fbmem.c
> > +++ b/drivers/video/fbdev/core/fbmem.c
> > @@ -1039,17 +1039,8 @@ 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;
> > -
> > -		info->flags &= ~FBINFO_MISC_USEREVENT;
> > -		event.info = info;
> > -		event.data = &mode;
> > -		fb_notifier_call_chain(evnt, &event);
> > -	}
> > +	if (!ret && (flags & FBINFO_MISC_USEREVENT))
> > +		fbcon_update_vcs(info, activate & FB_ACTIVATE_ALL);
> >  
> >  	return ret;
> >  }
> > diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
> > index 0d7a044852d7..bb1a610d0363 100644
> > --- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
> > +++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
> > @@ -1776,8 +1776,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 */
> > @@ -1799,14 +1797,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 4b9b882f8f52..54d6bee09121 100644
> > --- a/include/linux/fb.h
> > +++ b/include/linux/fb.h
> > @@ -124,16 +124,12 @@ struct fb_cursor_user {
> >   * Register/unregister for framebuffer events
> >   */
> >  
> > -/*	The resolution of the passed in fb_info about to change */ 
> > -#define FB_EVENT_MODE_CHANGE		0x01
> >  /*      CONSOLE-SPECIFIC: get console to framebuffer mapping */
> >  #define FB_EVENT_GET_CONSOLE_MAP        0x07
> >  /*      CONSOLE-SPECIFIC: set console to framebuffer mapping */
> >  #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 90e196c835dd..daaa97b0c9e6 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 @@ 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) {}
> >  #endif
> >  
> >  #endif /* _LINUX_FBCON_H */
> 
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch

WARNING: multiple messages have this Message-ID
From: Daniel Vetter <daniel@ffwll.ch>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: "Daniel Thompson" <daniel.thompson@linaro.org>,
	"Bartlomiej Zolnierkiewicz" <b.zolnierkie@samsung.com>,
	"Daniel Vetter" <daniel.vetter@ffwll.ch>,
	"Intel Graphics Development" <intel-gfx@lists.freedesktop.org>,
	LKML <linux-kernel@vger.kernel.org>,
	"DRI Development" <dri-devel@lists.freedesktop.org>,
	"Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
	"Yisheng Xie" <ysxie@foxmail.com>,
	"Hans de Goede" <hdegoede@redhat.com>,
	"Mikulas Patocka" <mpatocka@redhat.com>,
	linux-fbdev@vger.kernel.org, "Jingoo Han" <jingoohan1@gmail.com>,
	"Daniel Vetter" <daniel.vetter@intel.com>,
	"Lee Jones" <lee.jones@linaro.org>,
	"Peter Rosin" <peda@axentia.se>
Subject: Re: [PATCH 29/33] fbcon: replace FB_EVENT_MODE_CHANGE/_ALL with direct calls
Date: Tue, 21 May 2019 14:42:59 +0200	[thread overview]
Message-ID: <20190521124259.GN21222@phenom.ffwll.local> (raw)
In-Reply-To: <b91a6f78-43c2-796c-62f1-f84f2973c174@linux.intel.com>

On Tue, May 21, 2019 at 12:56:30PM +0200, Maarten Lankhorst wrote:
> Op 20-05-2019 om 10:22 schreef Daniel Vetter:
> > Create a new wrapper function for this, feels like there's some
> > refactoring room here between the two modes.
> >
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > Cc: Lee Jones <lee.jones@linaro.org>
> > Cc: Daniel Thompson <daniel.thompson@linaro.org>
> > Cc: Jingoo Han <jingoohan1@gmail.com>
> > Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > Cc: Hans de Goede <hdegoede@redhat.com>
> > Cc: Yisheng Xie <ysxie@foxmail.com>
> > Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
> > Cc: Peter Rosin <peda@axentia.se>
> > Cc: Mikulas Patocka <mpatocka@redhat.com>
> > Cc: linux-fbdev@vger.kernel.org
> > ---
> >  drivers/video/backlight/lcd.c          |  2 --
> >  drivers/video/fbdev/core/fbcon.c       | 15 +++++++++------
> >  drivers/video/fbdev/core/fbmem.c       | 13 ++-----------
> >  drivers/video/fbdev/sh_mobile_lcdcfb.c | 11 +----------
> >  include/linux/fb.h                     |  4 ----
> >  include/linux/fbcon.h                  |  2 ++
> >  6 files changed, 14 insertions(+), 33 deletions(-)
> >
> > diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
> > index 4b40c6a4d441..16298041b141 100644
> > --- a/drivers/video/backlight/lcd.c
> > +++ b/drivers/video/backlight/lcd.c
> > @@ -32,8 +32,6 @@ static int fb_notifier_callback(struct notifier_block *self,
> >  	/* If we aren't interested in this event, skip it immediately ... */
> >  	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;
> 
> Below it performs a call to set_mode() if it's none of the blanking events; it can be removed. :)

Oops ... I think I'll insert a patch here to create a new MODESET event
for backlights. We still need this one I think (maybe not for kms, but for
old fbdev drivers). And maybe a wrapper for fb_backlight_notify on top ...

Thanks for spotting this.
-Daniel

> 
> > diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
> > index c1a7476e980f..8cc62d340387 100644
> > --- a/drivers/video/fbdev/core/fbcon.c
> > +++ b/drivers/video/fbdev/core/fbcon.c
> > @@ -3005,6 +3005,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)
> >  {
> > @@ -3314,12 +3323,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 cbd58ba8a59d..55b88163edc2 100644
> > --- a/drivers/video/fbdev/core/fbmem.c
> > +++ b/drivers/video/fbdev/core/fbmem.c
> > @@ -1039,17 +1039,8 @@ 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;
> > -
> > -		info->flags &= ~FBINFO_MISC_USEREVENT;
> > -		event.info = info;
> > -		event.data = &mode;
> > -		fb_notifier_call_chain(evnt, &event);
> > -	}
> > +	if (!ret && (flags & FBINFO_MISC_USEREVENT))
> > +		fbcon_update_vcs(info, activate & FB_ACTIVATE_ALL);
> >  
> >  	return ret;
> >  }
> > diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
> > index 0d7a044852d7..bb1a610d0363 100644
> > --- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
> > +++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
> > @@ -1776,8 +1776,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 */
> > @@ -1799,14 +1797,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 4b9b882f8f52..54d6bee09121 100644
> > --- a/include/linux/fb.h
> > +++ b/include/linux/fb.h
> > @@ -124,16 +124,12 @@ struct fb_cursor_user {
> >   * Register/unregister for framebuffer events
> >   */
> >  
> > -/*	The resolution of the passed in fb_info about to change */ 
> > -#define FB_EVENT_MODE_CHANGE		0x01
> >  /*      CONSOLE-SPECIFIC: get console to framebuffer mapping */
> >  #define FB_EVENT_GET_CONSOLE_MAP        0x07
> >  /*      CONSOLE-SPECIFIC: set console to framebuffer mapping */
> >  #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 90e196c835dd..daaa97b0c9e6 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 @@ 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) {}
> >  #endif
> >  
> >  #endif /* _LINUX_FBCON_H */
> 
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  reply	other threads:[~2019-05-21 12:43 UTC|newest]

Thread overview: 112+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-20  8:21 [PATCH 00/33] fbcon notifier begone! Daniel Vetter
2019-05-20  8:21 ` [PATCH 01/33] dummycon: Sprinkle locking checks Daniel Vetter
2019-05-20  8:21 ` [PATCH 02/33] fbdev: locking check for fb_set_suspend Daniel Vetter
2019-05-20  8:21 ` [PATCH 03/33] vt: might_sleep() annotation for do_blank_screen Daniel Vetter
2019-05-20  8:21 ` [PATCH 04/33] vt: More locking checks Daniel Vetter
2019-05-20  8:21   ` Daniel Vetter
2019-05-20  8:21 ` [PATCH 05/33] fbdev/sa1100fb: Remove dead code Daniel Vetter
2019-05-20  8:21   ` Daniel Vetter
2019-05-20  8:21 ` [PATCH 06/33] fbdev/cyber2000: Remove struct display Daniel Vetter
2019-05-20  8:21   ` Daniel Vetter
2019-05-20  8:21 ` [PATCH 07/33] fbdev/aty128fb: Remove dead code Daniel Vetter
2019-05-20  8:21   ` Daniel Vetter
2019-05-20  8:21 ` [PATCH 08/33] fbcon: s/struct display/struct fbcon_display/ Daniel Vetter
2019-05-20  8:21   ` Daniel Vetter
2019-05-20  8:21 ` [PATCH 09/33] fbcon: Remove fbcon_has_exited Daniel Vetter
2019-05-20  8:21   ` Daniel Vetter
2019-05-21 14:23   ` [PATCH] " Daniel Vetter
2019-05-22 10:04     ` Bartlomiej Zolnierkiewicz
2019-05-22 10:04       ` Bartlomiej Zolnierkiewicz
2019-05-22 10:38       ` Daniel Vetter
2019-05-20  8:21 ` [PATCH 10/33] fbcon: call fbcon_fb_(un)registered directly Daniel Vetter
2019-05-20  8:21   ` Daniel Vetter
2019-05-20  8:33   ` Thomas Zimmermann
2019-05-20  8:33     ` Thomas Zimmermann
2019-05-20  8:37     ` Thomas Zimmermann
2019-05-20  8:37       ` Thomas Zimmermann
2019-05-21 15:09       ` Daniel Vetter
2019-05-21 15:09         ` Daniel Vetter
2019-05-20 17:08   ` Sam Ravnborg
2019-05-20 17:08     ` Sam Ravnborg
2019-05-20 17:08     ` Sam Ravnborg
2019-05-20 17:25     ` Daniel Vetter
2019-05-20 17:25       ` Daniel Vetter
2019-05-20  8:21 ` [PATCH 11/33] fbdev/sh_mobile: remove sh_mobile_lcdc_display_notify Daniel Vetter
2019-05-20  8:21   ` Daniel Vetter
2019-05-20  9:04   ` Geert Uytterhoeven
2019-05-20  8:21 ` [PATCH 12/33] fbdev/omap: sysfs files can't disappear before the device is gone Daniel Vetter
2019-05-20  8:21 ` [PATCH 13/33] fbdev: " Daniel Vetter
2019-05-20  8:21   ` Daniel Vetter
2019-05-20  8:21 ` [PATCH 14/33] staging/olpc: lock_fb_info can't fail Daniel Vetter
2019-05-20  8:21   ` Daniel Vetter
2019-05-20  8:21 ` [PATCH 15/33] fbdev/atyfb: " Daniel Vetter
2019-05-20  8:21   ` Daniel Vetter
2019-05-20  8:21 ` [PATCH 16/33] fbdev: lock_fb_info cannot fail Daniel Vetter
2019-05-20  8:21   ` Daniel Vetter
2019-05-20  8:22 ` [PATCH 17/33] fbcon: call fbcon_fb_bind directly Daniel Vetter
2019-05-20  8:22   ` Daniel Vetter
2019-05-20  8:22   ` Daniel Vetter
2019-05-20  8:22 ` [PATCH 18/33] fbdev: make unregister/unlink functions not fail Daniel Vetter
2019-05-20  8:22   ` Daniel Vetter
2019-05-20  8:22   ` Daniel Vetter
2019-05-20 19:08   ` [Intel-gfx] " kbuild test robot
2019-05-20 19:08     ` kbuild test robot
2019-05-20 19:08     ` kbuild test robot
2019-05-20 19:25   ` kbuild test robot
2019-05-20 19:25     ` kbuild test robot
2019-05-20 19:25     ` [Intel-gfx] " kbuild test robot
2019-05-20 21:45   ` kbuild test robot
2019-05-20 21:45     ` kbuild test robot
2019-05-20 21:45     ` kbuild test robot
2019-05-20  8:22 ` [PATCH 19/33] fbdev: unify unlink_framebufer paths Daniel Vetter
2019-05-21 10:52   ` Maarten Lankhorst
2019-05-20  8:22 ` [PATCH 20/33] fbdev/sh_mob: Remove fb notifier callback Daniel Vetter
2019-05-20  9:05   ` Geert Uytterhoeven
2019-05-20  9:19     ` Daniel Vetter
2019-05-20  8:22 ` [PATCH 21/33] fbdev: directly call fbcon_suspended/resumed Daniel Vetter
2019-05-20  8:22   ` Daniel Vetter
2019-05-20 19:24   ` kbuild test robot
2019-05-20 19:24     ` kbuild test robot
2019-05-20 19:24     ` kbuild test robot
2019-05-20  8:22 ` [PATCH 22/33] fbcon: Call fbcon_mode_deleted/new_modelist directly Daniel Vetter
2019-05-20  8:22   ` Daniel Vetter
2019-05-20  8:22 ` [PATCH 23/33] fbdev: Call fbcon_get_requirement directly Daniel Vetter
2019-05-20  8:22   ` Daniel Vetter
2019-05-20  8:22 ` [PATCH 24/33] Revert "backlight/fbcon: Add FB_EVENT_CONBLANK" Daniel Vetter
2019-05-20  8:22   ` Daniel Vetter
2019-05-20  8:22 ` [PATCH 25/33] fbcon: directly call fbcon_fb_blanked Daniel Vetter
2019-05-20  8:22 ` [PATCH 26/33] fbmem: pull fbcon_fb_blanked out of fb_blank Daniel Vetter
2019-05-20  8:22 ` [PATCH 27/33] fbdev: remove FBINFO_MISC_USEREVENT around fb_blank Daniel Vetter
2019-05-20 17:20   ` Sam Ravnborg
2019-05-20 17:20     ` Sam Ravnborg
2019-05-20 17:29     ` Daniel Vetter
2019-05-20 17:29       ` Daniel Vetter
2019-05-20 17:53       ` Sam Ravnborg
2019-05-20  8:22 ` [PATCH 28/33] fb: Flatten control flow in fb_set_var Daniel Vetter
2019-05-20  8:22 ` [PATCH 29/33] fbcon: replace FB_EVENT_MODE_CHANGE/_ALL with direct calls Daniel Vetter
2019-05-20  8:22   ` Daniel Vetter
2019-05-21 10:56   ` Maarten Lankhorst
2019-05-21 10:56     ` Maarten Lankhorst
2019-05-21 12:42     ` Daniel Vetter [this message]
2019-05-21 12:42       ` Daniel Vetter
2019-05-21 12:42       ` Daniel Vetter
2019-05-20  8:22 ` [PATCH 30/33] vgaswitcheroo: call fbcon_remap_all directly Daniel Vetter
2019-05-20  8:22   ` Daniel Vetter
2019-05-20  8:37   ` Lukas Wunner
2019-05-20  8:37     ` Lukas Wunner
2019-05-20  8:22 ` [PATCH 31/33] fbcon: Call con2fb_map functions directly Daniel Vetter
2019-05-20 19:28   ` [Intel-gfx] " kbuild test robot
2019-05-20 19:28     ` kbuild test robot
2019-05-20 19:34   ` [Intel-gfx] " kbuild test robot
2019-05-20 19:34     ` kbuild test robot
2019-05-20  8:22 ` [PATCH 32/33] fbcon: Document what I learned about fbcon locking Daniel Vetter
2019-05-21 11:13   ` Maarten Lankhorst
2019-05-20  8:22 ` [PATCH 33/33] staging/olpc_dcon: Add drm conversion to TODO Daniel Vetter
2019-05-20  8:30 ` ✗ Fi.CI.CHECKPATCH: warning for fbcon notifier begone! Patchwork
2019-05-20  8:41 ` ✗ Fi.CI.BAT: failure " Patchwork
2019-05-20  8:44 ` ✗ Fi.CI.SPARSE: warning " Patchwork
2019-05-21 17:08 ` ✗ Fi.CI.CHECKPATCH: warning for fbcon notifier begone! (rev2) Patchwork
2019-05-21 17:22 ` ✗ Fi.CI.SPARSE: " Patchwork
2019-05-21 17:29 ` ✗ Fi.CI.BAT: failure " Patchwork
2019-05-22  8:15 ` ✓ Fi.CI.BAT: success " Patchwork
2019-05-22 18:43 ` ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190521124259.GN21222@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --cc=b.zolnierkie@samsung.com \
    --cc=daniel.thompson@linaro.org \
    --cc=daniel.vetter@ffwll.ch \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=hdegoede@redhat.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jingoohan1@gmail.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mirq-linux@rere.qmqm.pl \
    --cc=mpatocka@redhat.com \
    --cc=peda@axentia.se \
    --cc=ysxie@foxmail.com \
    --subject='Re: [PATCH 29/33] fbcon: replace FB_EVENT_MODE_CHANGE/_ALL with direct calls' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.