[xsrc/trunk]: xsrc/external/mit/xorg-server/dist/hw/xfree86/common Match wsfb...

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/52449ab04e59
branches:  trunk
changeset: 10373:52449ab04e59
user:      maya <maya%NetBSD.org@localhost>
date:      Fri Aug 30 15:48:25 2019 +0000

description:
Match wsfb on x86, too.

When uefi booting without driver-specific GPU support, wsfb is the only
choice for a graphical driver.

While here, combine the wsfb cases.

diffstat:

 external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c |  11 +++------
 1 files changed, 4 insertions(+), 7 deletions(-)

diffs (29 lines):

diff -r d4bfa5323895 -r 52449ab04e59 external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
--- a/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c  Wed Aug 07 13:02:16 2019 +0000
+++ b/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c  Fri Aug 30 15:48:25 2019 +0000
@@ -350,21 +350,18 @@
     xf86AddMatchedDriver(md, "modesetting");
 #endif
 
-#if !defined(__sun)
-    /* Fallback to platform default frame buffer driver */
-#if !defined(__linux__) && defined(__sparc__)
-    xf86AddMatchedDriver(md, "wsfb");
-#else
+#if defined(__linux__)
     xf86AddMatchedDriver(md, "fbdev");
 #endif
-#endif                          /* !__sun */
 
     /* Fallback to platform default hardware */
 #if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
     xf86AddMatchedDriver(md, "vesa");
 #elif defined(__sparc__) && !defined(__sun)
     xf86AddMatchedDriver(md, "sunffb");
-#elif defined(__NetBSD__)
+#endif
+    
+#if defined(__NetBSD__)
     xf86AddMatchedDriver(md, "wsfb");
 #endif
 }