X Strike Force XFree86 SVN commit: rev 695 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2003-10-22 00:16:55 -0500 (Wed, 22 Oct 2003)
New Revision: 695
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/099_ati_recognize_radeon_9200_se.diff
Log:
Fix autodetection of RV280 5962 and 5963 chips by the ati driver.
- debian/patches/099_ati_recognize_radeon_9200_se.diff
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2003-10-22 04:48:39 UTC (rev 694)
+++ branches/4.3.0/sid/debian/changelog 2003-10-22 05:16:55 UTC (rev 695)
@@ -127,7 +127,8 @@
fullscreen mode on a flat panel at high resolutions. (Closes: #215997)
- debian/patches/098_nv_xvideo_fullscreen_fix.diff: new
- * Recognize the Radeon 9200 SE (RV280 5964) as any other RV280 chip.
+ * Recognize the Radeon 9200 SE (RV280 5964) as any other RV280 chip; also,
+ fix detection of RV280 5962 and 5963 chips by the ATI driver.
(Closes: #216896)
- debian/patches/099_ati_recognize_radeon_9200_se.diff: new
@@ -137,9 +138,8 @@
- debian/patches/056_i810_make_i830_usable.diff: only access pI830 when
XF86DRI is defined.
+ -- Branden Robinson <branden@debian.org> Wed, 22 Oct 2003 00:13:12 -0500
- -- Branden Robinson <branden@debian.org> Tue, 21 Oct 2003 16:57:12 -0500
-
xfree86 (4.3.0-0pre1v3) experimental; urgency=high
* Update pam_setcred() security fix to xdm to use pam_error and
Modified: branches/4.3.0/sid/debian/patches/099_ati_recognize_radeon_9200_se.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/099_ati_recognize_radeon_9200_se.diff 2003-10-22 04:48:39 UTC (rev 694)
+++ branches/4.3.0/sid/debian/patches/099_ati_recognize_radeon_9200_se.diff 2003-10-22 05:16:55 UTC (rev 695)
@@ -1,11 +1,13 @@
$Id$
-Recognize the Radeon 9200 SE (RV280 5964) as any other RV280 chip. Based
+Recognize the Radeon 9200 SE (RV280 5964) as any other RV280 chip. Also
+fixes autodetection of RV280 5962 and 5963 chips by the ati driver. Based
on a diff with XFree86 CVS HEAD by Michel Dänzer. Will be superseded by
XFree86 4.4.
---- xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h~ 2003-10-21 16:50:56.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2003-10-21 16:51:20.000000000 -0500
+diff -urN xc/programs/Xserver/hw/xfree86~/common/xf86PciInfo.h xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
+--- xc/programs/Xserver/hw/xfree86~/common/xf86PciInfo.h 2003-10-21 23:14:45.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2003-10-21 23:17:18.000000000 -0500
@@ -221,6 +221,7 @@
#define PCI_CHIP_RV280_5961 0x5961
#define PCI_CHIP_RV280_5962 0x5962
@@ -14,9 +16,24 @@
#define PCI_CHIP_RV280_5968 0x5968
#define PCI_CHIP_RV280_5969 0x5969
#define PCI_CHIP_RV280_596A 0x596A
-diff -u xc/programs/Xserver/hw/xfree86/drivers/ati~/radeon_driver.c xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
---- xc/programs/Xserver/hw/xfree86/drivers/ati~/radeon_driver.c 2003-10-20 14:35:33.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2003-10-21 16:47:18.000000000 -0500
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/ati/atichip.c xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c
+--- xc/programs/Xserver/hw/xfree86~/drivers/ati/atichip.c 2003-10-21 17:20:45.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c 2003-10-21 23:17:51.000000000 -0500
+@@ -677,8 +677,9 @@
+
+ case NewChipID('Y', '\''):
+ case NewChipID('Y', 'a'):
+- case NewChipID('I', 'b'):
+- case NewChipID('I', 'c'):
++ case NewChipID('Y', 'b'):
++ case NewChipID('Y', 'c'):
++ case NewChipID('Y', 'd'):
+ return ATI_CHIP_RV280;
+
+ case NewChipID('Y', 'h'):
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/ati/radeon_driver.c xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
+--- xc/programs/Xserver/hw/xfree86~/drivers/ati/radeon_driver.c 2003-10-21 23:14:45.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2003-10-21 23:17:18.000000000 -0500
@@ -1996,6 +1996,7 @@
case PCI_CHIP_RV280_5961:
case PCI_CHIP_RV280_5962:
@@ -25,9 +42,9 @@
info->ChipFamily = CHIP_FAMILY_RV280;
break;
-diff -u xc/programs/Xserver/hw/xfree86/drivers/ati~/radeon_probe.c xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c
---- xc/programs/Xserver/hw/xfree86/drivers/ati~/radeon_probe.c 2003-10-20 14:35:30.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c 2003-10-21 16:49:06.000000000 -0500
+diff -urN xc/programs/Xserver/hw/xfree86~/drivers/ati/radeon_probe.c xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c
+--- xc/programs/Xserver/hw/xfree86~/drivers/ati/radeon_probe.c 2003-10-21 23:14:45.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c 2003-10-21 23:17:18.000000000 -0500
@@ -116,6 +116,7 @@
{ PCI_CHIP_RV280_5961, "ATI Radeon 9200 5961 (AGP)" },
{ PCI_CHIP_RV280_5962, "ATI Radeon 9200 5962 (AGP)" },
Reply to: