Module Name: xsrc
Committed By: jmcneill
Date: Thu Aug 7 02:34:28 UTC 2014
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c
Log Message:
for i386 and amd64, append vesa to the end of the possible video driver
list. makes "startx" without a config file work on systems where there is
a known native driver, but it is not installed (like "vboxvideo").
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
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.6 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.7
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.6 Tue Aug 2 07:15:03 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c Thu Aug 7 02:34:28 2014
@@ -309,12 +309,10 @@ listPossibleVideoDrivers(char *matches[]
* Fallback to platform default frame buffer driver if we didn't probe
* anything useful
*/
- if (i == 0) {
+ if (i < (nmatches - 1)) {
#ifdef __NetBSD__
#if defined(__i386__) || defined(__amd64__)
matches[i++] = xnfstrdup("vesa");
-#else
- matches[i++] = xnfstrdup("wsfb");
#endif
#else /* !NetBSD */
#if !defined(__linux__) && defined(__sparc__)
@@ -329,6 +327,15 @@ listPossibleVideoDrivers(char *matches[]
#endif
#endif /* NetBSD */
}
+
+#ifdef __NetBSD__
+ /*
+ * If we haven't found any suitable drivers, try to use wsfb.
+ */
+ if (i == 0) {
+ matches[i++] = xnfstrdup("wsfb");
+ }
+#endif
}
/* copy a screen section and enter the desired driver
