Commit 0526c223 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

fbdev: Call fbcon_get_requirement directly 



Pretty simple case really.

v2: Forgot to remove a break;

v3: Add static inline to the dummy versions.

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: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Kees Cook <keescook@chromium.org>
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-24-daniel.vetter@ffwll.ch
parent 13ff178c

drivers/video/fbdev/core/fbcon.c

+2 −7
Original line number Diff line number Diff line
@@ -3283,7 +3283,7 @@ void fbcon_new_modelist(struct fb_info *info) 
	}

}



static void fbcon_get_requirement(struct fb_info *info,

void fbcon_get_requirement(struct fb_info *info,

			   struct fb_blit_caps *caps)

{

	struct vc_data *vc;
@@ -3325,7 +3325,6 @@ static int fbcon_event_notify(struct notifier_block *self, 
	struct fb_event *event = data;

	struct fb_info *info = event->info;

	struct fb_con2fbmap *con2fb;

	struct fb_blit_caps *caps;

	int idx, ret = 0;



	switch(action) {
@@ -3348,10 +3347,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_GET_REQ:

		caps = event->data;

		fbcon_get_requirement(info, caps);

		break;

	case FB_EVENT_REMAP_ALL_CONSOLE:

		idx = info->node;

		fbcon_remap_all(idx);

drivers/video/fbdev/core/fbmem.c

+1 −4
Original line number Diff line number Diff line
@@ -932,16 +932,13 @@ EXPORT_SYMBOL(fb_pan_display); 
static int fb_check_caps(struct fb_info *info, struct fb_var_screeninfo *var,

			 u32 activate)

{

	struct fb_event event;

	struct fb_blit_caps caps, fbcaps;

	int err = 0;



	memset(&caps, 0, sizeof(caps));

	memset(&fbcaps, 0, sizeof(fbcaps));

	caps.flags = (activate & FB_ACTIVATE_ALL) ? 1 : 0;

	event.info = info;

	event.data = &caps;

	fb_notifier_call_chain(FB_EVENT_GET_REQ, &event);

	fbcon_get_requirement(info, &caps);

	info->fbops->fb_get_caps(info, &fbcaps, var);



	if (((fbcaps.x ^ caps.x) & caps.x) ||

include/linux/fb.h

+0 −2
Original line number Diff line number Diff line
@@ -143,8 +143,6 @@ struct fb_cursor_user { 
#define FB_EVENT_MODE_CHANGE_ALL	0x0B

/*	A software display blank change occurred */

#define FB_EVENT_CONBLANK               0x0C

/*      Get drawing requirements        */

#define FB_EVENT_GET_REQ                0x0D

/*      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 */

include/linux/fbcon.h

+4 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 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);

void fbcon_get_requirement(struct fb_info *info,

			   struct fb_blit_caps *caps);

#else

static inline void fb_console_init(void) {}

static inline void fb_console_exit(void) {}
@@ -23,6 +25,8 @@ 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) {}

static inline void fbcon_get_requirement(struct fb_info *info,

					 struct fb_blit_caps *caps) {}

#endif



#endif /* _LINUX_FBCON_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE