Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50c50563 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

fbdev: directly call fbcon_suspended/resumed 



With the sh_mobile notifier removed we can just directly call the
fbcon code here.

v2: Remove now unused local variable.

v3: fixup !CONFIG_FRAMEBUFFER_CONSOLE, noticed by kbuild

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Konstantin Khorenko <khorenko@virtuozzo.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
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-22-daniel.vetter@ffwll.ch
parent 9c22ad98

drivers/video/fbdev/core/fbcon.c

+2 −8
Original line number Original line Diff line number Diff line
@@ -2919,7 +2919,7 @@ static int fbcon_set_origin(struct vc_data *vc) 
	return 0;

	return 0;

}

}





static void fbcon_suspended(struct fb_info *info)

void fbcon_suspended(struct fb_info *info)

{

{

	struct vc_data *vc = NULL;

	struct vc_data *vc = NULL;

	struct fbcon_ops *ops = info->fbcon_par;

	struct fbcon_ops *ops = info->fbcon_par;
@@ -2932,7 +2932,7 @@ static void fbcon_suspended(struct fb_info *info) 
	fbcon_cursor(vc, CM_ERASE);

	fbcon_cursor(vc, CM_ERASE);

}

}





static void fbcon_resumed(struct fb_info *info)

void fbcon_resumed(struct fb_info *info)

{

{

	struct vc_data *vc;

	struct vc_data *vc;

	struct fbcon_ops *ops = info->fbcon_par;

	struct fbcon_ops *ops = info->fbcon_par;
@@ -3330,12 +3330,6 @@ static int fbcon_event_notify(struct notifier_block *self, 
	int idx, ret = 0;

	int idx, ret = 0;





	switch(action) {

	switch(action) {

	case FB_EVENT_SUSPEND:

		fbcon_suspended(info);

		break;

	case FB_EVENT_RESUME:

		fbcon_resumed(info);

		break;

	case FB_EVENT_MODE_CHANGE:

	case FB_EVENT_MODE_CHANGE:

		fbcon_modechanged(info);

		fbcon_modechanged(info);

		break;

		break;

drivers/video/fbdev/core/fbmem.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -1917,17 +1917,14 @@ EXPORT_SYMBOL(unregister_framebuffer); 
 */

 */

void fb_set_suspend(struct fb_info *info, int state)

void fb_set_suspend(struct fb_info *info, int state)

{

{

	struct fb_event event;



	WARN_CONSOLE_UNLOCKED();

	WARN_CONSOLE_UNLOCKED();





	event.info = info;

	if (state) {

	if (state) {

		fb_notifier_call_chain(FB_EVENT_SUSPEND, &event);

		fbcon_suspended(info);

		info->state = FBINFO_STATE_SUSPENDED;

		info->state = FBINFO_STATE_SUSPENDED;

	} else {

	} else {

		info->state = FBINFO_STATE_RUNNING;

		info->state = FBINFO_STATE_RUNNING;

		fb_notifier_call_chain(FB_EVENT_RESUME, &event);

		fbcon_resumed(info);

	}

	}

}

}

EXPORT_SYMBOL(fb_set_suspend);

EXPORT_SYMBOL(fb_set_suspend);

include/linux/fb.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -126,14 +126,6 @@ struct fb_cursor_user { 




/*	The resolution of the passed in fb_info about to change */ 

/*	The resolution of the passed in fb_info about to change */ 

#define FB_EVENT_MODE_CHANGE		0x01

#define FB_EVENT_MODE_CHANGE		0x01

/*	The display on this fb_info is being suspended, no access to the

 *	framebuffer is allowed any more after that call returns

 */

#define FB_EVENT_SUSPEND		0x02

/*	The display on this fb_info was resumed, you can restore the display

 *	if you own it

 */

#define FB_EVENT_RESUME			0x03

/*      An entry from the modelist was removed */

/*      An entry from the modelist was removed */

#define FB_EVENT_MODE_DELETE            0x04

#define FB_EVENT_MODE_DELETE            0x04

include/linux/fbcon.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -7,12 +7,16 @@ void __exit fb_console_exit(void); 
int fbcon_fb_registered(struct fb_info *info);

int fbcon_fb_registered(struct fb_info *info);

void fbcon_fb_unregistered(struct fb_info *info);

void fbcon_fb_unregistered(struct fb_info *info);

void fbcon_fb_unbind(struct fb_info *info);

void fbcon_fb_unbind(struct fb_info *info);

void fbcon_suspended(struct fb_info *info);

void fbcon_resumed(struct fb_info *info);

#else

#else

static inline void fb_console_init(void) {}

static inline void fb_console_init(void) {}

static inline void fb_console_exit(void) {}

static inline void fb_console_exit(void) {}

static inline int fbcon_fb_registered(struct fb_info *info) { return 0; }

static inline int fbcon_fb_registered(struct fb_info *info) { return 0; }

static inline void fbcon_fb_unregistered(struct fb_info *info) {}

static inline void fbcon_fb_unregistered(struct fb_info *info) {}

static inline void fbcon_fb_unbind(struct fb_info *info) {}

static inline void fbcon_fb_unbind(struct fb_info *info) {}

static inline void fbcon_suspended(struct fb_info *info) {}

static inline void fbcon_resumed(struct fb_info *info) {}

#endif

#endif





#endif /* _LINUX_FBCON_H */
 
#endif /* _LINUX_FBCON_H */