Handle console remapping in fbcon in fb_switch_output(). Vga-switcheroo
invokes this functionality before switching physical outputs to a new
graphics device. Open-coding fbcon state in vga-switcheroo exposed fbdev
implementation details.

Vga-switcheroo is used for switching physical outputs among graphics
hardware. This functionality is only supported by DRM drivers. A later
update will further move fb_switch_output() into DRM's fbdev emulation;
thus fully decoupling vga-switcheroo from fbdev.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
---
  drivers/gpu/vga/vga_switcheroo.c |  6 +++---
  drivers/video/fbdev/core/fbmem.c | 10 ++++++++++
  include/linux/fb.h               |  1 +
  3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index 8fe1ae3c71bb..805953d0b941 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c

@@ -31,11 +31,9 @@
  #define pr_fmt(fmt) "vga_switcheroo: " fmt
  
  #include <linux/apple-gmux.h>
-#include <linux/console.h>
  #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>

@@ -735,8 +733,10 @@ 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 CONFIG_FB