summaryrefslogtreecommitdiffstats
path: root/xorg-server/autoconfig-nvidia.patch
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2012-05-28 17:37:08 +0000
committerpiernov <piernov@piernov.org>2012-05-28 17:37:08 +0000
commit5fc6340ddcd3c8247d2226183d60efc3db84719e (patch)
treefbea46f50ba21b26d1db4ab060bee9aa201a7022 /xorg-server/autoconfig-nvidia.patch
parente585145eb8bc53e2c9254dad59794570cffab180 (diff)
downloadnutyx-extra-5fc6340ddcd3c8247d2226183d60efc3db84719e.tar.gz
nutyx-extra-5fc6340ddcd3c8247d2226183d60efc3db84719e.tar.bz2
nutyx-extra-5fc6340ddcd3c8247d2226183d60efc3db84719e.tar.xz
nutyx-extra-5fc6340ddcd3c8247d2226183d60efc3db84719e.zip
xorg-server 1.12.1-1 màj port
Diffstat (limited to 'xorg-server/autoconfig-nvidia.patch')
-rw-r--r--xorg-server/autoconfig-nvidia.patch51
1 files changed, 25 insertions, 26 deletions
diff --git a/xorg-server/autoconfig-nvidia.patch b/xorg-server/autoconfig-nvidia.patch
index b900bf228..787e1dfbf 100644
--- a/xorg-server/autoconfig-nvidia.patch
+++ b/xorg-server/autoconfig-nvidia.patch
@@ -1,28 +1,27 @@
-diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c
---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000
-+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000
-@@ -1111,7 +1111,23 @@
- {
- int idx = 0;
+diff -Nur xorg-server-1.12.1.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.12.1/hw/xfree86/common/xf86pciBus.c
+--- xorg-server-1.12.1.orig/hw/xfree86/common/xf86pciBus.c 2012-03-27 18:50:40.000000000 +0000
++++ xorg-server-1.12.1/hw/xfree86/common/xf86pciBus.c 2012-05-19 16:39:07.000000000 +0000
+@@ -1144,7 +1144,22 @@
+ int idx = 0;
+
#ifdef __linux__
-- driverList[idx++] = "nouveau";
-+ switch (dev->device_id)
-+ {
-+ /* NV1 */
-+ case 0x0008:
-+ case 0x0009:
-+ driverList[idx++] = "vesa";
-+ break;
-+ /* NV3 */
-+ case 0x0018:
-+ case 0x0019:
-+ driverList[idx++] = "nouveau";
-+ break;
-+ default:
-+ driverList[idx++] = "nouveau";
-+ driverList[idx++] = "nvidia";
-+ break;
-+ }
+- driverList[idx++] = "nouveau";
++ switch (dev->device_id) {
++ /* NV1 */
++ case 0x0008:
++ case 0x0009:
++ driverList[idx++] = "vesa";
++ break;
++ /* NV3 */
++ case 0x0018:
++ case 0x0019:
++ driverList[idx++] = "nouveau";
++ break;
++ default:
++ driverList[idx++] = "nouveau";
++ driverList[idx++] = "nvidia";
++ break;
++ }
#endif
- driverList[idx++] = "nv";
- break;
+ driverList[idx++] = "nv";
+ break;