From ff26d987e2d52eb762b9b36281b31650e881f765 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 24 Aug 2009 05:05:49 +0000 Subject: [PATCH] * Mon Aug 24 2009 Ben Skeggs 1.6.99-40.20090820 - xserver-1.6.1-nouveau.patch: remove vesa fallback for 0x08xx chips, KMS should work on them now, there's accel issues on some of them but we can fallback to shadowfb in the driver and keep KMS support. --- xorg-x11-server.spec | 7 ++++++- xserver-1.6.1-nouveau.patch | 13 ++----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index c81c855..147a815 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.6.99 -Release: 39.%{gitdate}%{?dist} +Release: 40.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -507,6 +507,11 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Mon Aug 24 2009 Ben Skeggs 1.6.99-40.20090820 +- xserver-1.6.1-nouveau.patch: remove vesa fallback for 0x08xx chips, KMS + should work on them now, there's accel issues on some of them but we can + fallback to shadowfb in the driver and keep KMS support. + * Fri Aug 21 2009 Adam Jackson 1.6.99-39.20090820 - xserver-1.6.99-default-modes.patch: Don't add default modes to the pool if the driver returned real modes (and has no EDID). diff --git a/xserver-1.6.1-nouveau.patch b/xserver-1.6.1-nouveau.patch index 6b1110e..c6428ec 100644 --- a/xserver-1.6.1-nouveau.patch +++ b/xserver-1.6.1-nouveau.patch @@ -78,7 +78,7 @@ diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConf index bc4c80b..d8fa80f 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c -@@ -180,7 +180,32 @@ videoPtrToDriverList(struct pci_device *dev, +@@ -180,7 +180,23 @@ videoPtrToDriverList(struct pci_device *dev, break; case 0x102b: driverList[0] = "mga"; break; case 0x10c8: driverList[0] = "neomagic"; break; @@ -96,16 +96,7 @@ index bc4c80b..d8fa80f 100644 + driverList[0] = "nv"; + break; + default: -+ switch (dev->device_id & 0xfff0) { -+ /* Non-functional with both nouveau and nv */ -+ case 0x0840: -+ case 0x0860: -+ driverList[0] = "vesa"; -+ break; -+ default: -+ driverList[0] = "nouveau"; -+ break; -+ } ++ driverList[0] = "nouveau"; + break; + } + break;