Merge branch 'x86-fb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 fb changes from Ingo Molnar:
 "This tree includes preparatory patches for SimpleDRM driver support,
  by David Herrmann.  They clean up x86 framebuffer support by creating
  simplefb devices wherever possible.  More background can be found at

     http://lwn.net/Articles/558104/"

* 'x86-fb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  fbdev: fbcon: select VT_HW_CONSOLE_BINDING
  fbdev: efifb: bind to efi-framebuffer
  fbdev: vesafb: bind to platform-framebuffer device
  fbdev: simplefb: add common x86 RGB formats
  x86: sysfb: move EFI quirks from efifb to sysfb
  x86: provide platform-devices for boot-framebuffers
  fbdev: simplefb: mark as fw and allocate apertures
  fbdev: simplefb: add init through platform_data

diff --combined arch/x86/Kconfig
index f16fc34e66086e6977a918912e7c736d00be865e,5c56559e0c50f93fc8a2d6a1648ea281c6444cbb..ff47e230d3554ef3014e6cf6bbe6215b726441d9
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -16,7 -16,6 +16,7 @@@ config X86_6
        def_bool y
        depends on 64BIT
        select X86_DEV_DMA_OPS
 +      select ARCH_USE_CMPXCHG_LOCKREF
  
  ### Arch settings
  config X86
@@@ -82,6 -81,7 +82,6 @@@
        select HAVE_USER_RETURN_NOTIFIER
        select ARCH_BINFMT_ELF_RANDOMIZE_PIE
        select HAVE_ARCH_JUMP_LABEL
 -      select HAVE_TEXT_POKE_SMP
        select HAVE_GENERIC_HARDIRQS
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
        select SPARSE_IRQ
@@@ -1627,9 -1627,9 +1627,9 @@@ config KEXE
  
          It is an ongoing process to be certain the hardware in a machine
          is properly shutdown, so do not be surprised if this code does not
 -        initially work for you.  It may help to enable device hotplugging
 -        support.  As of this writing the exact hardware interface is
 -        strongly in flux, so no good recommendation can be made.
 +        initially work for you.  As of this writing the exact hardware
 +        interface is strongly in flux, so no good recommendation can be
 +        made.
  
  config CRASH_DUMP
        bool "kernel crash dumps"
@@@ -2270,6 -2270,32 +2270,32 @@@ config RAPIDI
  
  source "drivers/rapidio/Kconfig"
  
+ config X86_SYSFB
+       bool "Mark VGA/VBE/EFI FB as generic system framebuffer"
+       help
+         Firmwares often provide initial graphics framebuffers so the BIOS,
+         bootloader or kernel can show basic video-output during boot for
+         user-guidance and debugging. Historically, x86 used the VESA BIOS
+         Extensions and EFI-framebuffers for this, which are mostly limited
+         to x86.
+         This option, if enabled, marks VGA/VBE/EFI framebuffers as generic
+         framebuffers so the new generic system-framebuffer drivers can be
+         used on x86. If the framebuffer is not compatible with the generic
+         modes, it is adverticed as fallback platform framebuffer so legacy
+         drivers like efifb, vesafb and uvesafb can pick it up.
+         If this option is not selected, all system framebuffers are always
+         marked as fallback platform framebuffers as usual.
+ 
+         Note: Legacy fbdev drivers, including vesafb, efifb, uvesafb, will
+         not be able to pick up generic system framebuffers if this option
+         is selected. You are highly encouraged to enable simplefb as
+         replacement if you select this option. simplefb can correctly deal
+         with generic system framebuffers. But you should still keep vesafb
+         and others enabled as fallback if a system framebuffer is
+         incompatible with simplefb.
+ 
+         If unsure, say Y.
+ 
  endmenu
  
  
@@@ -2332,6 -2358,10 +2358,6 @@@ config HAVE_ATOMIC_IOMA
        def_bool y
        depends on X86_32
  
 -config HAVE_TEXT_POKE_SMP
 -      bool
 -      select STOP_MACHINE if SMP
 -
  config X86_DEV_DMA_OPS
        bool
        depends on X86_64 || STA2X11