iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fbcon: Call fbcon_mode_deleted/new_modelist directly

Browse Source 
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: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Maarten 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
This commit is contained in:
Daniel Vetter 2019-05-28 11:02:53 +02:00
parent 50c5056356
commit 13ff178ccd
4 changed files with 16 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/video/fbdev/core/fbcon.c
View File

@ -3019,8 +3019,8 @@ static void fbcon_set_all_vcs(struct fb_info *info)
fbcon_modechanged(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_videomode *mode)
{ {
struct fb_info *fb_info; struct fb_info *fb_info;
struct fbcon_display *p; struct fbcon_display *p;
@ -3262,7 +3262,7 @@ static void fbcon_fb_blanked(struct fb_info *info, int blank)
ops->blank_state = blank; ops->blank_state = blank;
} }
static void fbcon_new_modelist(struct fb_info *info) void fbcon_new_modelist(struct fb_info *info)
{ {
int i; int i;
struct vc_data *vc; struct vc_data *vc;
@ -3324,7 +3324,6 @@ static int fbcon_event_notify(struct notifier_block *self,
{ {
struct fb_event *event = data; struct fb_event *event = data;
struct fb_info *info = event->info; struct fb_info *info = event->info;
struct fb_videomode *mode;
struct fb_con2fbmap *con2fb; struct fb_con2fbmap *con2fb;
struct fb_blit_caps *caps; struct fb_blit_caps *caps;
int idx, ret = 0; int idx, ret = 0;
@ -3336,10 +3335,6 @@ static int fbcon_event_notify(struct notifier_block *self,
case FB_EVENT_MODE_CHANGE_ALL: case FB_EVENT_MODE_CHANGE_ALL:
fbcon_set_all_vcs(info); fbcon_set_all_vcs(info);
break; break;
case FB_EVENT_MODE_DELETE:
mode = event->data;
ret = fbcon_mode_deleted(info, mode);
break;
case FB_EVENT_SET_CONSOLE_MAP: case FB_EVENT_SET_CONSOLE_MAP:
/* called with console lock held */ /* called with console lock held */
con2fb = event->data; con2fb = event->data;
@ -3353,9 +3348,6 @@ static int fbcon_event_notify(struct notifier_block *self,
case FB_EVENT_BLANK: case FB_EVENT_BLANK:
fbcon_fb_blanked(info, *(int *)event->data); fbcon_fb_blanked(info, *(int *)event->data);
break; break;
case FB_EVENT_NEW_MODELIST:
fbcon_new_modelist(info);
break;
case FB_EVENT_GET_REQ: case FB_EVENT_GET_REQ:
caps = event->data; caps = event->data;
fbcon_get_requirement(info, caps); fbcon_get_requirement(info, caps);

22
drivers/video/fbdev/core/fbmem.c
View File

@ -966,16 +966,11 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
/* make sure we don't delete the videomode of current var */ /* make sure we don't delete the videomode of current var */
ret = fb_mode_is_equal(&mode1, &mode2); ret = fb_mode_is_equal(&mode1, &mode2);
if (!ret) { if (!ret)
struct fb_event event; fbcon_mode_deleted(info, &mode1);
event.info = info;
event.data = &mode1;
ret = fb_notifier_call_chain(FB_EVENT_MODE_DELETE, &event);
}
if (!ret) if (!ret)
fb_delete_videomode(&mode1, &info->modelist); fb_delete_videomode(&mode1, &info->modelist);
ret = (ret) ? -EINVAL : 0; ret = (ret) ? -EINVAL : 0;
@ -1992,7 +1987,6 @@ subsys_initcall(fbmem_init);
int fb_new_modelist(struct fb_info *info) int fb_new_modelist(struct fb_info *info)
{ {
struct fb_event event;
struct fb_var_screeninfo var = info->var; struct fb_var_screeninfo var = info->var;
struct list_head *pos, *n; struct list_head *pos, *n;
struct fb_modelist *modelist; 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)) { fbcon_new_modelist(info);
event.info = info;
err = fb_notifier_call_chain(FB_EVENT_NEW_MODELIST, &event);
}
return err; return 0;
} }
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

5
include/linux/fb.h
View File

@ -126,8 +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
/* An entry from the modelist was removed */
#define FB_EVENT_MODE_DELETE 0x04
#ifdef CONFIG_GUMSTIX_AM200EPD #ifdef CONFIG_GUMSTIX_AM200EPD
/* only used by mach-pxa/am200epd.c */ /* only used by mach-pxa/am200epd.c */
@ -142,9 +140,6 @@ struct fb_cursor_user {
/* A hardware display blank change occurred */ /* A hardware display blank change occurred */
#define FB_EVENT_BLANK 0x09 #define FB_EVENT_BLANK 0x09
/* Private modelist is to be replaced */ /* 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 #define FB_EVENT_MODE_CHANGE_ALL 0x0B
/* A software display blank change occurred */ /* A software display blank change occurred */
#define FB_EVENT_CONBLANK 0x0C #define FB_EVENT_CONBLANK 0x0C

6
include/linux/fbcon.h
View File

@ -9,6 +9,9 @@ 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_suspended(struct fb_info *info);
void fbcon_resumed(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 #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) {}
@ -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_fb_unbind(struct fb_info *info) {}
static inline void fbcon_suspended(struct fb_info *info) {} static inline void fbcon_suspended(struct fb_info *info) {}
static inline void fbcon_resumed(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
#endif /* _LINUX_FBCON_H */ #endif /* _LINUX_FBCON_H */