mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
vgaswitcheroo: call fbcon_remap_all directly
While at it, clean up the interface a bit and push the console locking into fbcon.c. v2: Remove now outdated comment (Lukas). v3: Forgot to add static inline to the dummy function. Acked-by: Lukas Wunner <[email protected]> Signed-off-by: Daniel Vetter <[email protected]> Reviewed-by: Sam Ravnborg <[email protected]> Reviewed-by: Maarten Lankhorst <[email protected]> Cc: Lukas Wunner <[email protected]> Cc: David Airlie <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Maarten Lankhorst <[email protected]> Cc: Maxime Ripard <[email protected]> Cc: Sean Paul <[email protected]> Cc: Bartlomiej Zolnierkiewicz <[email protected]> Cc: Hans de Goede <[email protected]> Cc: Yisheng Xie <[email protected]> Cc: [email protected] Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
This commit is contained in:
parent
9e14670026
commit
1cd51b5d20
4 changed files with 10 additions and 19 deletions
|
|
@ -3149,17 +3149,16 @@ void fbcon_fb_unregistered(struct fb_info *info)
|
|||
do_unregister_con_driver(&fb_con);
|
||||
}
|
||||
|
||||
/* called with console_lock held */
|
||||
static void fbcon_remap_all(int idx)
|
||||
void fbcon_remap_all(struct fb_info *info)
|
||||
{
|
||||
int i;
|
||||
|
||||
WARN_CONSOLE_UNLOCKED();
|
||||
int i, idx = info->node;
|
||||
|
||||
console_lock();
|
||||
if (deferred_takeover) {
|
||||
for (i = first_fb_vc; i <= last_fb_vc; i++)
|
||||
con2fb_map_boot[i] = idx;
|
||||
fbcon_map_override();
|
||||
console_unlock();
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -3172,6 +3171,7 @@ static void fbcon_remap_all(int idx)
|
|||
first_fb_vc + 1, last_fb_vc + 1);
|
||||
info_idx = idx;
|
||||
}
|
||||
console_unlock();
|
||||
}
|
||||
|
||||
#ifdef CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
|
||||
|
|
@ -3337,10 +3337,6 @@ static int fbcon_event_notify(struct notifier_block *self,
|
|||
con2fb = event->data;
|
||||
con2fb->framebuffer = con2fb_map[con2fb->console - 1];
|
||||
break;
|
||||
case FB_EVENT_REMAP_ALL_CONSOLE:
|
||||
idx = info->node;
|
||||
fbcon_remap_all(idx);
|
||||
break;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue