# Pastebin 8logjfIs
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 1503a787b323..bb7a25830ebb 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -210,30 +210,23 @@ config SYSFB
 config SYSFB_SIMPLEFB
 	bool "Mark VGA/VBE/EFI FB as generic system framebuffer"
 	depends on X86 || EFI
+	depends on FB_SIMPLE || DRM_SIMPLEDRM
+	depends on !(DRM_EFIDRM || DRM_VESADRM)
 	select SYSFB
 	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 BIOS or EFI systems.
-	  This option, if enabled, marks VGA/VBE/EFI framebuffers as generic
-	  framebuffers so the new generic system-framebuffer drivers can be
-	  used instead. If the framebuffer is not compatible with the generic
-	  modes, it is advertised 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.
+	  to x86 BIOS or EFI systems are require the legacy fbdev subsystem.
+
+	  This option, if enabled, marks VBE/EFI framebuffers as generic
+	  framebuffers so the simplefb/simpledrm  drivers can be used instead.
+
+	  The DRM_EFIDRM and DRM_VESADRM drivers should provide a better
+	  replacement.
+
+	  If unsure, say N.
 
 config TH1520_AON_PROTOCOL
 	tristate "Always-On firmware protocol"
diff --git a/drivers/gpu/drm/sysfb/Kconfig b/drivers/gpu/drm/sysfb/Kconfig
index 9c9884c7efc6..b01eef80cfee 100644
--- a/drivers/gpu/drm/sysfb/Kconfig
+++ b/drivers/gpu/drm/sysfb/Kconfig
@@ -9,7 +9,7 @@ config DRM_SYSFB_HELPER
 
 config DRM_EFIDRM
 	tristate "EFI framebuffer driver"
-	depends on DRM && MMU && EFI && (!SYSFB_SIMPLEFB || COMPILE_TEST)
+	depends on DRM && MMU && EFI
 	select APERTURE_HELPERS
 	select DRM_CLIENT_SELECTION
 	select DRM_GEM_SHMEM_HELPER
@@ -59,7 +59,7 @@ config DRM_SIMPLEDRM
 
 config DRM_VESADRM
 	tristate "VESA framebuffer driver"
-	depends on DRM && MMU && X86 && (!SYSFB_SIMPLEFB || COMPILE_TEST)
+	depends on DRM && MMU && X86
 	select APERTURE_HELPERS
 	select DRM_CLIENT_SELECTION
 	select DRM_GEM_SHMEM_HELPER
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index efb923a88ce6..7b5b18326fe4 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -426,6 +426,7 @@ config FB_UVESA
 config FB_VESA
 	bool "VESA VGA graphics support"
 	depends on (FB = y) && X86
+	depends on !DRM_VESADRM
 	select APERTURE_HELPERS
 	select FB_IOMEM_HELPERS
 	select SYSFB
@@ -438,6 +439,7 @@ config FB_VESA
 config FB_EFI
 	bool "EFI-based Framebuffer Support"
 	depends on (FB = y) && !IA64 && EFI
+	depends on !DRM_EFIDRM
 	select APERTURE_HELPERS
 	select DRM_PANEL_ORIENTATION_QUIRKS
 	select FB_IOMEM_HELPERS