Module Name: xsrc Committed By: maya Date: Fri Aug 30 15:48:25 UTC 2019
Modified Files: xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.13 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.14 --- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.13 Mon Jan 28 11:50:00 2019 +++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c Fri Aug 30 15:48:25 2019 @@ -350,21 +350,18 @@ listPossibleVideoDrivers(XF86MatchedDriv 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 }