From eb62eda19ac3c79a20ea430e1feb0be8745cebf8 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mar 04 2010 22:54:50 +0000 Subject: * Thu Mar 04 2010 Adam Jackson 1.7.99.901-12.20100304 - xserver-1.6.1-nouveau.patch: Fall back to nv if nouveau won't load. (#519298) --- diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index a8b541f..141088d 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -19,7 +19,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.7.99.901 -Release: 11.%{gitdate}%{dist} +Release: 12.%{gitdate}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -522,6 +522,9 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Thu Mar 04 2010 Adam Jackson 1.7.99.901-12.20100304 +- xserver-1.6.1-nouveau.patch: Fall back to nv if nouveau won't load. (#519298) + * Thu Mar 04 2010 Peter Hutterer 1.7.99.901-11.20100304 - Update to today's git. - BuildRequires libselinux-devel >= 2.0.86 diff --git a/xserver-1.6.1-nouveau.patch b/xserver-1.6.1-nouveau.patch index 984e8e1..35a1ff9 100644 --- a/xserver-1.6.1-nouveau.patch +++ b/xserver-1.6.1-nouveau.patch @@ -1,14 +1,14 @@ -From 05c3ac7e882e0f46f908cc165f87d0e81399431d Mon Sep 17 00:00:00 2001 +From a685b5cf34532cef96fc9b05f735088ac0c0c7ad Mon Sep 17 00:00:00 2001 From: Fedora X Ninjas Date: Tue, 16 Feb 2010 11:38:17 +1000 -Subject: [PATCH] autoconfig: select nouveau by default for NVIDIA GPUs +Subject: [PATCH 08/17] autoconfig: select nouveau by default for NVIDIA GPUs Also, don't treat DRI setup failure as an error for nouveau. --- glx/glxdri.c | 7 +++++-- glx/glxdri2.c | 7 +++++-- - hw/xfree86/common/xf86AutoConfig.c | 18 +++++++++++++++++- - 3 files changed, 27 insertions(+), 5 deletions(-) + hw/xfree86/common/xf86AutoConfig.c | 19 ++++++++++++++++++- + 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/glx/glxdri.c b/glx/glxdri.c index 21e44d1..30b820c 100644 @@ -75,10 +75,10 @@ index 0f998de..a244809 100644 return NULL; } diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c -index 7f4ada8..369101c 100644 +index 7f4ada8..d964c6c 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c -@@ -192,7 +192,23 @@ videoPtrToDriverList(struct pci_device *dev, +@@ -192,7 +192,24 @@ videoPtrToDriverList(struct pci_device *dev, break; case 0x102b: driverList[0] = "mga"; break; case 0x10c8: driverList[0] = "neomagic"; break; @@ -97,6 +97,7 @@ index 7f4ada8..369101c 100644 + break; + default: + driverList[0] = "nouveau"; ++ driverList[1] = "nv"; + break; + } + break; @@ -104,5 +105,5 @@ index 7f4ada8..369101c 100644 case 0x1b36: driverList[0] = "qxl"; break; case 0x1163: driverList[0] = "rendition"; break; -- -1.6.6.1 +1.6.5.2