Simplify auto device configuration for choosing wsfb, fbdev

Submitted by coypu@sdf.org on Aug. 31, 2019, 8:45 p.m.

Details

Message ID 20190831204516.GB26492@SDF.ORG
State New
Headers show
Series "Simplify auto device configuration for choosing wsfb, fbdev" ( rev: 1 ) in X.org

Not browsing as part of any series.

Commit Message

coypu@sdf.org Aug. 31, 2019, 8:45 p.m.
Hi xorg-devel, Matthieu,

I wanted to simplify the logic, and thought this is a good opportunity
to eliminate local diffs.

I don't want to list OSes without wsfb, because I understand that is a
netbsd/openbsd driver, and always have it as a fallback for us.

Additionally, I understand "fbdev" is linux-specific, so have the logic
match this intent.

Let me know if this is in some way not good enough for OpenBSD.

Thanks.

Patch hide | download patch | download mbox

diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
index 0f4f05de9..9cb419162 100644
--- a/hw/xfree86/common/xf86AutoConfig.c
+++ b/hw/xfree86/common/xf86AutoConfig.c
@@ -298,14 +298,10 @@  listPossibleVideoDrivers(XF86MatchedDrivers *md)
     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__)
@@ -313,6 +309,10 @@  listPossibleVideoDrivers(XF86MatchedDrivers *md)
 #elif defined(__sparc__) && !defined(__sun)
     xf86AddMatchedDriver(md, "sunffb");
 #endif
+
+#if defined(__NetBSD__) || defined(__OpenBSD__)
+    xf86AddMatchedDriver(md, "wsfb");
+#endif
 }
 
 /* copy a screen section and enter the desired driver