Processed: Re: Bug#535388: Upgrade xserver-xorg-core 2:1.6.1.901-2 -> 2:1.6.1.901-3 breaks xserver-xorg-video-intel
Processing commands for cont...@bugs.debian.org: > forcemerge 534475 535388 Bug#534475: xserver-xorg-core: GDM crashes when trying to log into Gnome Bug#535388: Upgrade xserver-xorg-core 2:1.6.1.901-2 -> 2:1.6.1.901-3 breaks xserver-xorg-video-intel Bug#534487: xserver-xorg-core crashes after upgrade to version (1.6.1.901-3) Bug#534522: xserver crashes when setting resolution with xrandr Bug#534541: xserver-xorg-core: upgrade from 2:1.6.1.901-2 to 2:1.6.1.901-3 breaks DRI2 Forcibly Merged 534475 534487 534522 534541 535388. > thank you Stopping processing here. Please contact me if you need assistance. Debian bug tracking system administrator (administrator, Debian Bugs database) -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#535388: Upgrade xserver-xorg-core 2:1.6.1.901-2 -> 2:1.6.1.901-3 breaks xserver-xorg-video-intel
forcemerge 534475 535388 thank you Andreas Kloeckner wrote: > Package: xserver-xorg-core > Version: 2:1.5.99.902-1 > Severity: normal > > I recently performed the upgrade mentioned in the subject line. > Thereafter, the X server hangs with a disappeared mouse cursor > seconds after starting my desktop sessions, repeatably. > > My intel driver is version 2.7.99.901-2, I use UXA and KMS. > > I'm happy that I found a binary deb of an old X server that > allowed me to get into X and investigate. > Several people have this problem, caused by an ABI break in the server, or some hidden problem in Intel that the server upgrade revealed. Merging with other bugs. Brice -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xorg: Changes to 'debian-unstable'
debian/changelog |7 +++ debian/local/debian-x11-keymap.fdi |2 +- 2 files changed, 8 insertions(+), 1 deletion(-) New commits: commit 9ee31ba51f0323f0b2dba5bdf1b392b43121d905 Author: Timo Aaltonen Date: Thu Jul 2 17:26:40 2009 +0300 debian-x11-keymap.fdi: Check for input.keys from info.capabilities. (closes: #535291) diff --git a/debian/changelog b/debian/changelog index b70d93f..621d276 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xorg (1:7.4+4) UNRELEASED; urgency=low + + * debian-x11-keymap.fdi: Check for input.keys from info.capabilities. +(closes: #535291) + + -- Timo Aaltonen Thu, 02 Jul 2009 17:23:57 +0300 + xorg (1:7.4+3) unstable; urgency=low * Call db_stop at the end of xserver-xorg.postinst, otherwise debconf gets diff --git a/debian/local/debian-x11-keymap.fdi b/debian/local/debian-x11-keymap.fdi index 38c04a7..5891375 100644 --- a/debian/local/debian-x11-keymap.fdi +++ b/debian/local/debian-x11-keymap.fdi @@ -1,7 +1,7 @@ - + debian-setup-keyboard -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[bts-link] source package xserver-xorg-video-intel
# # bts-link upstream status pull for source package xserver-xorg-video-intel # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html # user bts-link-upstr...@lists.alioth.debian.org # remote status report for #447754 # * https://bugs.freedesktop.org/show_bug.cgi?id=13025 # * remote status changed: NEW -> REOPENED usertags 447754 - status-NEW usertags 447754 + status-REOPENED thanks -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
[bts-link] source package xorg-server
# # bts-link upstream status pull for source package xorg-server # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html # user bts-link-upstr...@lists.alioth.debian.org # remote status report for #535388 # * https://bugs.freedesktop.org/show_bug.cgi?id=22537 # * remote status changed: (?) -> NEW usertags 535388 + status-NEW # remote status report for #535388 # * https://bugs.freedesktop.org/show_bug.cgi?id=22537 # * remote status changed: (?) -> NEW usertags 535388 + status-NEW # remote status report for #535388 # * https://bugs.freedesktop.org/show_bug.cgi?id=22537 # * remote status changed: (?) -> NEW usertags 535388 + status-NEW # remote status report for #535388 # * https://bugs.freedesktop.org/show_bug.cgi?id=22537 # * remote status changed: (?) -> NEW usertags 535388 + status-NEW # remote status report for #535388 # * https://bugs.freedesktop.org/show_bug.cgi?id=22537 # * remote status changed: (?) -> NEW usertags 535388 + status-NEW thanks -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |7 +
debian/patches/178_nvidia_autodetect.patch | 40 +
debian/patches/series |1
3 files changed, 48 insertions(+)
New commits:
commit 399677d1582d4c6f1c5f4546d31ba7cb1acae746
Author: Bryce Harrington
Date: Thu Jul 2 13:36:42 2009 -0700
Patch from Sarvatt to autodetect nvidia
diff --git a/debian/changelog b/debian/changelog
index 17ef542..56b4a9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.6.1.901-2ubuntu3) karmic; urgency=low
+
+ * Add 178_nvidia_autodetect.patch - Automatically detect and use -nvidia
+or -nouveau instead of -nv if installed. Thanks Sarvatt!
+
+ -- Bryce Harrington Thu, 02 Jul 2009 13:28:42 -0700
+
xorg-server (2:1.6.1.901-2ubuntu2) karmic; urgency=low
* Add xserver-1.5.0-bad-fbdev-thats-mine.patch - If no xorg.conf is
diff --git a/debian/patches/178_nvidia_autodetect.patch
b/debian/patches/178_nvidia_autodetect.patch
new file mode 100644
index 000..fe2a769
--- /dev/null
+++ b/debian/patches/178_nvidia_autodetect.patch
@@ -0,0 +1,40 @@
+diff --git a/hw/xfree86/common/xf86AutoConfig.c
b/hw/xfree86/common/xf86AutoConfig.c
+index 19c06c8..e40551e 100644
+--- a/hw/xfree86/common/xf86AutoConfig.c
b/hw/xfree86/common/xf86AutoConfig.c
+ -181,7 +181,34 @@ videoPtrToDriverList(struct pci_device *dev,
+ case 0x102b:driverList[0] = "mga"; break;
+ case 0x10c8:driverList[0] = "neomagic"; break;
+ case 0x105d:driverList[0] = "i128"; break;
+- case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
++ case 0x10de: case 0x12d2:
++ switch (dev->device_id) {
++ /* NV1 */
++ case 0x0008:
++ case 0x0009:
++ driverList[0] = "vesa";
++ break;
++ /* NV3 */
++ case 0x0018:
++ case 0x0019:
++ driverList[0] = "nv";
++ break;
++ default:
++ switch (dev->device_id & 0xfff0) {
++ /* Non-functional with both nouveau and nv */
++ case 0x0840:
++ case 0x0860:
++ driverList[0] = "nvidia";
++ driverList[1] = "vesa";
++ break;
++ default:
++ driverList[0] = "nvidia";
++ driverList[1] = "nouveau";
++ driverList[2] = "nv";
++ break;
++ }
++ break;
++ }
+ case 0x1163:driverList[0] = "rendition"; break;
+ case 0x5333:
+ switch (dev->device_id)
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index 8f6ebc2..ff31875 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -30,3 +30,4 @@ Add-libgcrypt-as-an-option-for-sha1.diff
174_set_bg_pixmap_of_cow_to_none.patch
177_animated_cursor_change_master.patch
xserver-1.5.0-bad-fbdev-thats-mine.patch
+178_nvidia_autodetect.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#531597: To Talk Dirty You Neeed too Build Your Vocabulary
To Talk Diirty You Need too Build Your Vocabulary www. gen65. net. Man Files Suit, Claims Leaap Dance Injury -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#535516: Please add /usr/lib32/X11/locale to search path on i386
Package: libx11-6 Version: 2:1.2.1-1 Severity: wishlist File: /usr/lib/libX11.so.6.2.0 Hi, when running 32bit application on amd64 the 32bit locales can not be used. The reason for this is that libX11 only searches the following dirs: % strings /usr/lib32/libX11.so.6.2.0 | grep locale setlocale /usr/share/X11/locale /usr/lib/X11/locale It would be real nice if /usr/lib32/X11/locale could be included on i386 and /usr/lib64/X11/locale (for running 64bit binaries on i386). MfG Goswin -- System Information: Debian Release: squeeze/sid APT prefers transitional-i386 APT policy: (500, 'transitional-i386'), (500, 'unstable'), (400, 'unstable-i386'), (1, 'experimental-i386'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.29.4-frosties-1 Locale: LANG=C, LC_CTYPE=de_DE (charmap=ISO-8859-1) Shell: /bin/sh linked to /bin/bash Versions of packages libx11-6 depends on: ii libc6 2.9-18 GNU C Library: Shared libraries ii libx11-data 2:1.2.1-1 X11 client-side library ii libxcb1 1.3-2 X C Binding libx11-6 recommends no packages. libx11-6 suggests no packages. -- debconf information excluded -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |4 ++-- debian/patches/178_nvidia_autodetect.patch |3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) New commits: commit e9616674a53e670b05dbed5c6bd52e7f6abd4988 Author: Bryce Harrington Date: Thu Jul 2 14:05:54 2009 -0700 Updated patch fixing some syntax errors diff --git a/debian/changelog b/debian/changelog index 56b4a9e..c4eefdf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xorg-server (2:1.6.1.901-2ubuntu3) karmic; urgency=low +xorg-server (2:1.6.1.901-2ubuntu3) UNRELEASED; urgency=low * Add 178_nvidia_autodetect.patch - Automatically detect and use -nvidia or -nouveau instead of -nv if installed. Thanks Sarvatt! - -- Bryce Harrington Thu, 02 Jul 2009 13:28:42 -0700 + -- Bryce Harrington Thu, 02 Jul 2009 14:05:40 -0700 xorg-server (2:1.6.1.901-2ubuntu2) karmic; urgency=low diff --git a/debian/patches/178_nvidia_autodetect.patch b/debian/patches/178_nvidia_autodetect.patch index fe2a769..483e22d 100644 --- a/debian/patches/178_nvidia_autodetect.patch +++ b/debian/patches/178_nvidia_autodetect.patch @@ -2,7 +2,7 @@ diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConf index 19c06c8..e40551e 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c - -181,7 +181,34 @@ videoPtrToDriverList(struct pci_device *dev, +@@ -181,7 +181,34 @@ videoPtrToDriverList(struct pci_device *dev, case 0x102b:driverList[0] = "mga"; break; case 0x10c8:driverList[0] = "neomagic"; break; case 0x105d:driverList[0] = "i128"; break; @@ -37,4 +37,5 @@ index 19c06c8..e40551e 100644 + } case 0x1163:driverList[0] = "rendition"; break; case 0x5333: - switch (dev->device_id) \ No newline at end of file + switch (dev->device_id) + -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |2 -
debian/patches/104_nvidia_autodetect.patch | 41 +
debian/patches/178_nvidia_autodetect.patch | 41 -
debian/patches/series |2 -
4 files changed, 43 insertions(+), 43 deletions(-)
New commits:
commit d2620507214f217783063e9a6841c2f6fa2bcb3c
Author: Timo Aaltonen
Date: Fri Jul 3 00:26:33 2009 +0300
Fix DOS formatting from the nvidia patch, and renumber it as patch 104
diff --git a/debian/changelog b/debian/changelog
index c4eefdf..1b70af1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
xorg-server (2:1.6.1.901-2ubuntu3) UNRELEASED; urgency=low
- * Add 178_nvidia_autodetect.patch - Automatically detect and use -nvidia
+ * Add 104_nvidia_autodetect.patch - Automatically detect and use -nvidia
or -nouveau instead of -nv if installed. Thanks Sarvatt!
-- Bryce Harrington Thu, 02 Jul 2009 14:05:40 -0700
diff --git a/debian/patches/104_nvidia_autodetect.patch
b/debian/patches/104_nvidia_autodetect.patch
new file mode 100644
index 000..ac3383b
--- /dev/null
+++ b/debian/patches/104_nvidia_autodetect.patch
@@ -0,0 +1,41 @@
+diff --git a/hw/xfree86/common/xf86AutoConfig.c
b/hw/xfree86/common/xf86AutoConfig.c
+index 19c06c8..e40551e 100644
+--- a/hw/xfree86/common/xf86AutoConfig.c
b/hw/xfree86/common/xf86AutoConfig.c
+@@ -181,7 +181,34 @@ videoPtrToDriverList(struct pci_device *dev,
+ case 0x102b:driverList[0] = "mga"; break;
+ case 0x10c8:driverList[0] = "neomagic"; break;
+ case 0x105d:driverList[0] = "i128"; break;
+- case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
++ case 0x10de: case 0x12d2:
++ switch (dev->device_id) {
++ /* NV1 */
++ case 0x0008:
++ case 0x0009:
++ driverList[0] = "vesa";
++ break;
++ /* NV3 */
++ case 0x0018:
++ case 0x0019:
++ driverList[0] = "nv";
++ break;
++ default:
++ switch (dev->device_id & 0xfff0) {
++ /* Non-functional with both nouveau and nv */
++ case 0x0840:
++ case 0x0860:
++ driverList[0] = "nvidia";
++ driverList[1] = "vesa";
++ break;
++ default:
++ driverList[0] = "nvidia";
++ driverList[1] = "nouveau";
++ driverList[2] = "nv";
++ break;
++ }
++ break;
++ }
+ case 0x1163:driverList[0] = "rendition"; break;
+ case 0x5333:
+ switch (dev->device_id)
+
diff --git a/debian/patches/178_nvidia_autodetect.patch
b/debian/patches/178_nvidia_autodetect.patch
deleted file mode 100644
index 483e22d..000
--- a/debian/patches/178_nvidia_autodetect.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/hw/xfree86/common/xf86AutoConfig.c
b/hw/xfree86/common/xf86AutoConfig.c
-index 19c06c8..e40551e 100644
a/hw/xfree86/common/xf86AutoConfig.c
-+++ b/hw/xfree86/common/xf86AutoConfig.c
-@@ -181,7 +181,34 @@ videoPtrToDriverList(struct pci_device *dev,
- case 0x102b:driverList[0] = "mga"; break;
- case 0x10c8:driverList[0] = "neomagic"; break;
- case 0x105d:driverList[0] = "i128"; break;
-- case 0x10de: case 0x12d2: driverList[0] = "nv"; break;
-+ case 0x10de: case 0x12d2:
-+ switch (dev->device_id) {
-+ /* NV1 */
-+ case 0x0008:
-+ case 0x0009:
-+ driverList[0] = "vesa";
-+ break;
-+ /* NV3 */
-+ case 0x0018:
-+ case 0x0019:
-+ driverList[0] = "nv";
-+ break;
-+ default:
-+ switch (dev->device_id & 0xfff0) {
-+ /* Non-functional with both nouveau and nv */
-+ case 0x0840:
-+ case 0x0860:
-+ driverList[0] = "nvidia";
-+ driverList[1] = "vesa";
-+ break;
-+ default:
-+ driverList[0] = "nvidia";
-+ driverList[1] = "nouveau";
-+ driverList[2] = "nv";
-+ break;
-+ }
-+ break;
-+ }
- case 0x1163:driverList[0] = "rendition"; break;
- case 0x5333:
- switch (dev->device_id)
-
diff --git a/debian/patches/series b/debian/patches/series
index ff31875..5be1dbf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,7 @@ Add-libgcrypt-as-an-option-for-sha1.diff
101_fedora_xserver-1.3.0-document-fontpath-correctly.patch
102_ubuntu_sharevts_load_cpu.patch
103_psb_auto.patch
+104_nvidia_autodetect.patch
110_fedora_no_move_damage.patch
121_only_switch_
Lomve Making Positiions To Please A Man
Lvoe Maaking Positions To Please A Man www. gen65. net. Carttoon Network head resigns after marketing stuunt -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |4 +++-
debian/patches/105_fglrx_autodetect.patch | 23 +++
debian/patches/series |1 +
3 files changed, 27 insertions(+), 1 deletion(-)
New commits:
commit 9d66c2277d54004a68ecaedd7bf491a6bdc2f947
Author: Bryce Harrington
Date: Thu Jul 2 15:30:09 2009 -0700
Add similar patch for -fglrx
diff --git a/debian/changelog b/debian/changelog
index 1b70af1..d6d99ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ xorg-server (2:1.6.1.901-2ubuntu3) UNRELEASED; urgency=low
* Add 104_nvidia_autodetect.patch - Automatically detect and use -nvidia
or -nouveau instead of -nv if installed. Thanks Sarvatt!
+ * Add 105_fglrx_autodetect.patch - Automatically detect and use -fglrx
+on R600 and newer hardware if it is installed.
- -- Bryce Harrington Thu, 02 Jul 2009 14:05:40 -0700
+ -- Bryce Harrington Thu, 02 Jul 2009 15:27:10 -0700
xorg-server (2:1.6.1.901-2ubuntu2) karmic; urgency=low
diff --git a/debian/patches/105_fglrx_autodetect.patch
b/debian/patches/105_fglrx_autodetect.patch
new file mode 100644
index 000..0d0e895
--- /dev/null
+++ b/debian/patches/105_fglrx_autodetect.patch
@@ -0,0 +1,23 @@
+Binary files patched/.git/index and working/.git/index differ
+diff -Nurp patched/hw/xfree86/common/xf86AutoConfig.c
working/hw/xfree86/common/xf86AutoConfig.c
+--- patched/hw/xfree86/common/xf86AutoConfig.c 2009-07-02 15:11:52.0
-0700
working/hw/xfree86/common/xf86AutoConfig.c 2009-07-02 15:18:18.0
-0700
+@@ -165,7 +165,17 @@ videoPtrToDriverList(struct pci_device *
+ case 0x1142:driverList[0] = "apm"; break;
+ case 0xedd8:driverList[0] = "ark"; break;
+ case 0x1a03:driverList[0] = "ast"; break;
+- case 0x1002:driverList[0] = "ati"; break;
++ case 0x1002:
++ if (dev->device_id < 0x9400)
++{
++ driverList[0] = "ati";
++}
++else
++{
++ driverList[0] = "fglrx"; /* Supports R600 and newer only */
++ driverList[1] = "ati";
++}
++break;
+ case 0x102c:driverList[0] = "chips"; break;
+ case 0x1013:driverList[0] = "cirrus"; break;
+ case 0x8086:
diff --git a/debian/patches/series b/debian/patches/series
index 5be1dbf..08e3664 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,7 @@ Add-libgcrypt-as-an-option-for-sha1.diff
102_ubuntu_sharevts_load_cpu.patch
103_psb_auto.patch
104_nvidia_autodetect.patch
+105_fglrx_autodetect.patch
110_fedora_no_move_damage.patch
121_only_switch_vt_when_active.diff
135_rethrow_signals.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xorg-server: Changes to 'ubuntu'
debian/changelog |4 ++--
debian/patches/105_fglrx_autodetect.patch | 12 +++-
2 files changed, 9 insertions(+), 7 deletions(-)
New commits:
commit da618048dcca2aa648ec8591eadc29d8db39eed3
Author: Bryce Harrington
Date: Thu Jul 2 16:00:50 2009 -0700
Guess we can also do -radeonhd
diff --git a/debian/changelog b/debian/changelog
index d6d99ee..3de47df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,9 @@ xorg-server (2:1.6.1.901-2ubuntu3) UNRELEASED; urgency=low
* Add 104_nvidia_autodetect.patch - Automatically detect and use -nvidia
or -nouveau instead of -nv if installed. Thanks Sarvatt!
* Add 105_fglrx_autodetect.patch - Automatically detect and use -fglrx
-on R600 and newer hardware if it is installed.
+on R600 and newer hardware or -radeonhd if either is installed.
- -- Bryce Harrington Thu, 02 Jul 2009 15:27:10 -0700
+ -- Bryce Harrington Thu, 02 Jul 2009 15:59:58 -0700
xorg-server (2:1.6.1.901-2ubuntu2) karmic; urgency=low
diff --git a/debian/patches/105_fglrx_autodetect.patch
b/debian/patches/105_fglrx_autodetect.patch
index 0d0e895..90ae00c 100644
--- a/debian/patches/105_fglrx_autodetect.patch
+++ b/debian/patches/105_fglrx_autodetect.patch
@@ -1,21 +1,23 @@
Binary files patched/.git/index and working/.git/index differ
diff -Nurp patched/hw/xfree86/common/xf86AutoConfig.c
working/hw/xfree86/common/xf86AutoConfig.c
--- patched/hw/xfree86/common/xf86AutoConfig.c 2009-07-02 15:11:52.0
-0700
-+++ working/hw/xfree86/common/xf86AutoConfig.c 2009-07-02 15:18:18.0
-0700
-@@ -165,7 +165,17 @@ videoPtrToDriverList(struct pci_device *
working/hw/xfree86/common/xf86AutoConfig.c 2009-07-02 15:59:14.0
-0700
+@@ -165,7 +165,19 @@ videoPtrToDriverList(struct pci_device *
case 0x1142:driverList[0] = "apm"; break;
case 0xedd8:driverList[0] = "ark"; break;
case 0x1a03:driverList[0] = "ast"; break;
- case 0x1002:driverList[0] = "ati"; break;
+ case 0x1002:
-+ if (dev->device_id < 0x9400)
++ if (dev->device_id < 0x791e)
+{
-+ driverList[0] = "ati";
++driverList[0] = "radeonhd";
++ driverList[1] = "ati";
+}
+else
+{
+ driverList[0] = "fglrx"; /* Supports R600 and newer only */
-+ driverList[1] = "ati";
++driverList[1] = "radeonhd";
++ driverList[2] = "ati";
+}
+break;
case 0x102c:driverList[0] = "chips"; break;
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xorg-server: Changes to 'ubuntu'
debian/patches/105_fglrx_autodetect.patch | 22 +-
1 file changed, 9 insertions(+), 13 deletions(-)
New commits:
commit 373935d6a0bee920a6277311b26b985e19251f84
Author: Bryce Harrington
Date: Thu Jul 2 16:17:24 2009 -0700
Okay, let's be ballsy and even try -fglrx on older cards; who knows, it
may work. If -fglrx is installed it's going to break -ati anyway.
diff --git a/debian/patches/105_fglrx_autodetect.patch
b/debian/patches/105_fglrx_autodetect.patch
index 90ae00c..74e93e3 100644
--- a/debian/patches/105_fglrx_autodetect.patch
+++ b/debian/patches/105_fglrx_autodetect.patch
@@ -1,24 +1,20 @@
Binary files patched/.git/index and working/.git/index differ
diff -Nurp patched/hw/xfree86/common/xf86AutoConfig.c
working/hw/xfree86/common/xf86AutoConfig.c
--- patched/hw/xfree86/common/xf86AutoConfig.c 2009-07-02 15:11:52.0
-0700
-+++ working/hw/xfree86/common/xf86AutoConfig.c 2009-07-02 15:59:14.0
-0700
-@@ -165,7 +165,19 @@ videoPtrToDriverList(struct pci_device *
working/hw/xfree86/common/xf86AutoConfig.c 2009-07-02 16:16:59.0
-0700
+@@ -165,7 +165,15 @@ videoPtrToDriverList(struct pci_device *
case 0x1142:driverList[0] = "apm"; break;
case 0xedd8:driverList[0] = "ark"; break;
case 0x1a03:driverList[0] = "ast"; break;
- case 0x1002:driverList[0] = "ati"; break;
+ case 0x1002:
-+ if (dev->device_id < 0x791e)
-+{
-+driverList[0] = "radeonhd";
-+ driverList[1] = "ati";
-+}
-+else
-+{
-+ driverList[0] = "fglrx"; /* Supports R600 and newer only */
-+driverList[1] = "radeonhd";
-+ driverList[2] = "ati";
-+}
++/* Technical fglrx works only on 0x791e and newer, but
++ if the user has it installed, -ati and -radeonhd
++ probably won't work anyway so we may as well try it
++ in case it randomly does work. */
++driverList[0] = "fglrx"; /* Supports R600 and newer only */
++driverList[1] = "radeonhd";
++driverList[2] = "ati";
+break;
case 0x102c:driverList[0] = "chips"; break;
case 0x1013:driverList[0] = "cirrus"; break;
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
How too Easily Find aa 'Friend with Benefits'
How to Easmily Find a 'Friend with Beneefits' www. gen65. net. Boy caught inn toy maachine -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Important Foreplay Tips - What Every Guy Msut Know About Forepplay
Important Forrelpay Tips - What Every Guy Must Know About Foreplay www. gen65. net. Caandian woman finds braand new grenade in backyard -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Find tzhe G Spot -- 3 Explosive Techniques That Never Fail
Find the G Spot - 33 Explosive Techniques That Neveer Fail www. gen65. net. Baby boom shows Australians doo it fqor their country -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
How to Turn a Girl onn Without Touching Her - Trust Me! Here is Something You Don't Want too Miss
How to Turn a Girl on Without Touching Her - Trust Me! Here is Something You oDn't Want too Miss www. gen88. net. Clinic: March Madness gojod time for vasectoomy -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Want too Know oHw Tight a Condom Should Be?
Want too Know How Tikght a Condom Should Be? www. gen88. net. Dogs in war unleashed onnn movie piracy -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
