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

Commit 13ff178c authored by Daniel Vetter's avatar Daniel Vetter
Browse files

fbcon: Call fbcon_mode_deleted/new_modelist directly 



I'm not entirely clear on what new_modelist actually does, it seems
exclusively for a sysfs interface. Which in the end does amount to a
normal fb_set_par to check the mode, but then takes a different path
in both fbmem.c and fbcon.c.

I have no idea why these 2 paths are different, but then I also don't
really want to find out. So just do the simple conversion to a direct
function call.

v2: static inline for the dummy versions, I forgot.

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: Mikulas Patocka <mpatocka@redhat.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Peter Rosin <peda@axentia.se>
Cc: Yisheng Xie <ysxie@foxmail.com>
Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: linux-fbdev@vger.kernel.org
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-23-daniel.vetter@ffwll.ch
parent 50c50563

drivers/video/fbdev/core/fbcon.c

+3 −11
Original line number Diff line number Diff line
@@ -3019,7 +3019,7 @@ static void fbcon_set_all_vcs(struct fb_info *info) 
		fbcon_modechanged(info);

}



static int fbcon_mode_deleted(struct fb_info *info,

int fbcon_mode_deleted(struct fb_info *info,

		       struct fb_videomode *mode)

{

	struct fb_info *fb_info;
@@ -3262,7 +3262,7 @@ static void fbcon_fb_blanked(struct fb_info *info, int blank) 
	ops->blank_state = blank;

}



static void fbcon_new_modelist(struct fb_info *info)

void fbcon_new_modelist(struct fb_info *info)

{

	int i;

	struct vc_data *vc;
@@ -3324,7 +3324,6 @@ static int fbcon_event_notify(struct notifier_block *self, 
{

	struct fb_event *event = data;

	struct fb_info *info = event->info;

	struct fb_videomode *mode;

	struct fb_con2fbmap *con2fb;

	struct fb_blit_caps *caps;

	int idx, ret = 0;
@@ -3336,10 +3335,6 @@ static int fbcon_event_notify(struct notifier_block *self, 
	case FB_EVENT_MODE_CHANGE_ALL:

		fbcon_set_all_vcs(info);

		break;

	case FB_EVENT_MODE_DELETE:

		mode = event->data;

		ret = fbcon_mode_deleted(info, mode);

		break;

	case FB_EVENT_SET_CONSOLE_MAP:

		/* called with console lock held */

		con2fb = event->data;
@@ -3353,9 +3348,6 @@ static int fbcon_event_notify(struct notifier_block *self, 
	case FB_EVENT_BLANK:

		fbcon_fb_blanked(info, *(int *)event->data);

		break;

	case FB_EVENT_NEW_MODELIST:

		fbcon_new_modelist(info);

		break;

	case FB_EVENT_GET_REQ:

		caps = event->data;

		fbcon_get_requirement(info, caps);

drivers/video/fbdev/core/fbmem.c

+7 −15
Original line number Diff line number Diff line
@@ -966,13 +966,8 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) 
		/* make sure we don't delete the videomode of current var */

		ret = fb_mode_is_equal(&mode1, &mode2);



		if (!ret) {

		    struct fb_event event;



		    event.info = info;

		    event.data = &mode1;

		    ret = fb_notifier_call_chain(FB_EVENT_MODE_DELETE, &event);

		}

		if (!ret)

			fbcon_mode_deleted(info, &mode1);



		if (!ret)

			fb_delete_videomode(&mode1, &info->modelist);
@@ -1992,7 +1987,6 @@ subsys_initcall(fbmem_init); 


int fb_new_modelist(struct fb_info *info)

{

	struct fb_event event;

	struct fb_var_screeninfo var = info->var;

	struct list_head *pos, *n;

	struct fb_modelist *modelist;
@@ -2012,14 +2006,12 @@ int fb_new_modelist(struct fb_info *info) 
		}

	}



	err = 1;

	if (list_empty(&info->modelist))

		return 1;



	if (!list_empty(&info->modelist)) {

		event.info = info;

		err = fb_notifier_call_chain(FB_EVENT_NEW_MODELIST, &event);

	}

	fbcon_new_modelist(info);



	return err;

	return 0;

}



MODULE_LICENSE("GPL");

include/linux/fb.h

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


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

#define FB_EVENT_MODE_CHANGE		0x01

/*      An entry from the modelist was removed */

#define FB_EVENT_MODE_DELETE            0x04



#ifdef CONFIG_GUMSTIX_AM200EPD

/* only used by mach-pxa/am200epd.c */
@@ -142,9 +140,6 @@ struct fb_cursor_user { 
/*      A hardware display blank change occurred */

#define FB_EVENT_BLANK                  0x09

/*      Private modelist is to be replaced */

#define FB_EVENT_NEW_MODELIST           0x0A

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

        all vc's should be changed         */

#define FB_EVENT_MODE_CHANGE_ALL	0x0B

/*	A software display blank change occurred */

#define FB_EVENT_CONBLANK               0x0C

include/linux/fbcon.h

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ void fbcon_fb_unregistered(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);

int fbcon_mode_deleted(struct fb_info *info,

		       struct fb_videomode *mode);

void fbcon_new_modelist(struct fb_info *info);

#else

static inline void fb_console_init(void) {}

static inline void fb_console_exit(void) {}
@@ -17,6 +20,9 @@ static inline void fbcon_fb_unregistered(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) {}

static inline int fbcon_mode_deleted(struct fb_info *info,

				     struct fb_videomode *mode) { return 0; }

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

#endif



#endif /* _LINUX_FBCON_H */