diff --git a/N_autoconfig_fallback_fbdev_first.diff b/N_autoconfig_fallback_fbdev_first.diff deleted file mode 100644 index c3ed047..0000000 --- a/N_autoconfig_fallback_fbdev_first.diff +++ /dev/null @@ -1,37 +0,0 @@ -Index: hw/xfree86/common/xf86AutoConfig.c -=================================================================== ---- hw/xfree86/common/xf86AutoConfig.c.orig -+++ hw/xfree86/common/xf86AutoConfig.c -@@ -267,26 +267,26 @@ listPossibleVideoDrivers(char *matches[] - 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"); -+ matches[i++] = xnfstrdup("fbdev"); - #elif defined(__sparc__) && !defined(sun) - matches[i++] = xnfstrdup("sunffb"); - #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"); -+ matches[i++] = xnfstrdup("vesa"); - #endif - } - #endif /* !sun */ diff --git a/n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch b/n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch new file mode 100644 index 0000000..e0405c7 --- /dev/null +++ b/n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch @@ -0,0 +1,59 @@ +From: Egbert Eich +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 + +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 +--- + 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 */ diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 4746503..f5af13e 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Aug 8 19:51:35 UTC 2013 - eich@suse.com + +- n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch: + 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. + replaces: N_autoconfig_fallback_fbdev_first.diff + ------------------------------------------------------------------- Thu Aug 8 15:55:14 UTC 2013 - sndirsch@suse.com diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 6637c97..23fe874 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -153,7 +153,7 @@ Patch125: N_0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch127: N_dpms_screensaver.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch143: N_autoconfig_fallback_fbdev_first.diff +Patch143: n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch145: N_driver-autoconfig.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines @@ -282,7 +282,7 @@ cp %{SOURCE96} . ### disabled for now #%patch125 -p1 %patch127 -p1 -%patch143 -p0 +%patch143 -p1 %patch145 -p0 ### disabled for now #%patch162 -p1