forked from pool/xorg-x11-server
60 lines
2.0 KiB
Diff
60 lines
2.0 KiB
Diff
|
From: Egbert Eich <Egbert Eich eich@suse.de>
|
||
|
|
Date: Thu Aug 8 21:43:44 2013 +0200
|
||
|
|
Subject: [PATCH]autoconf: On Linux give fbdev driver a higher precedence than vesa
|
||
|
|
Patch-Mainline: never
|
||
|
|
Git-commit: ccda2310eedf55215de792cdd5a793e3bf58fed1
|
||
|
|
Git-repo:
|
||
|
|
References:
|
||
|
|
Signed-off-by: Egbert Eich <eich@suse.com>
|
||
|
|
|
||
|
|
At SUSE we want to perfer the fbdev driver over the VESA driver
|
||
|
|
at autoconfiguration as it is expected that fbdev will work in
|
||
|
|
allmost all situations where no native driver can be found -
|
||
|
|
even under UEFI and with secure boot.
|
||
|
|
|
||
|
|
Signed-off-by: Egbert Eich <Egbert Eich eich@suse.de>
|
||
|
|
---
|
||
|
|
hw/xfree86/common/xf86AutoConfig.c | 18 +++++++++---------
|
||
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c
|
||
|
|
index 2da792e..252fe37 100644
|
||
|
|
--- a/hw/xfree86/common/xf86AutoConfig.c
|
||
|
|
+++ b/hw/xfree86/common/xf86AutoConfig.c
|
||
|
|
@@ -277,26 +277,26 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
|
||
|
|
if (i < (nmatches - 1))
|
||
|
|
i = xf86PciMatchDriver(matches, nmatches);
|
||
|
|
#endif
|
||
|
|
+
|
||
|
|
+#if defined(__linux__)
|
||
|
|
+ matches[i++] = xnfstrdup("modesetting");
|
||
|
|
+#endif
|
||
|
|
/* Fallback to platform default hardware */
|
||
|
|
if (i < (nmatches - 1)) {
|
||
|
|
-#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
|
||
|
|
- matches[i++] = xnfstrdup("vesa");
|
||
|
|
-#elif defined(__sparc__) && !defined(sun)
|
||
|
|
+#if defined(__sparc__) && !defined(sun)
|
||
|
|
matches[i++] = xnfstrdup("sunffb");
|
||
|
|
+#else
|
||
|
|
+ matches[i++] = xnfstrdup("fbdev");
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
|
||
|
|
-#if defined(__linux__)
|
||
|
|
- matches[i++] = xnfstrdup("modesetting");
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
#if !defined(sun)
|
||
|
|
/* Fallback to platform default frame buffer driver */
|
||
|
|
if (i < (nmatches - 1)) {
|
||
|
|
#if !defined(__linux__) && defined(__sparc__)
|
||
|
|
matches[i++] = xnfstrdup("wsfb");
|
||
|
|
-#else
|
||
|
|
- matches[i++] = xnfstrdup("fbdev");
|
||
|
|
+#elif defined(__i386__) || defined(__amd64__) || defined(__hurd__)
|
||
|
|
+ matches[i++] = xnfstrdup("vesa");
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
#endif /* !sun */
|