Merge branch 'topic/remove-fbcon-notifiers' into drm-misc-next

[linux-2.6-microblaze.git] / drivers / gpu / vga / vga_switcheroo.c

diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index a48d810..087304b 100644 (file)
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -35,6 +35,7 @@
 #include <linux/debugfs.h>
 #include <linux/fb.h>
 #include <linux/fs.h>
+#include <linux/fbcon.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pm_domain.h>
@@ -734,14 +735,8 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client)
        if (!active->driver_power_control)
                set_audio_state(active->id, VGA_SWITCHEROO_OFF);
 
-       if (new_client->fb_info) {
-               struct fb_event event;
-
-               console_lock();
-               event.info = new_client->fb_info;
-               fb_notifier_call_chain(FB_EVENT_REMAP_ALL_CONSOLE, &event);
-               console_unlock();
-       }
+       if (new_client->fb_info)
+               fbcon_remap_all(new_client->fb_info);
 
        mutex_lock(&vgasr_priv.mux_hw_lock);
        ret = vgasr_priv.handler->switchto(new_client->id);