[xsrc/netbsd-9]: xsrc/external/mit/xorg-server/dist/hw/xfree86/common Pull up...

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

details:   https://anonhg.NetBSD.org/xsrc/rev/867f3e0cdc27
branches:  netbsd-9
changeset: 10375:867f3e0cdc27
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 01 14:18:00 2019 +0000

description:
Pull up following revision(s) (requested by maya in ticket #152):

        external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c: revision 1.14
        external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c: revision 1.15

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.

 -

Try modesetting on x86, too.

Not the best option without functional GLAMOR, but it does work.

diffstat:

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

diffs (36 lines):

diff -r a50bff0b0757 -r 867f3e0cdc27 external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
--- a/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c  Wed Jul 24 16:07:59 2019 +0000
+++ b/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c  Sun Sep 01 14:18:00 2019 +0000
@@ -346,25 +346,24 @@
     xf86AddMatchedDriver(md, "modesetting");
 #endif
 
-#if defined(__NetBSD__) && (defined(__aarch64__) || defined(__arm__))
+#if defined(__NetBSD__) && \
+    (defined(__aarch64__) || defined(__arm__) || \
+     defined(__i386__) || defined(__amd64__))
     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
 }