X Strike Force XFree86 SVN commit: rev 976 - in branches/4.3.0/sid/debian: . patches
Author: branden
Date: 2004-01-27 01:09:06 -0500 (Tue, 27 Jan 2004)
New Revision: 976
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/099_ati_recognize_radeon_9200_se.diff
Log:
Add recognition of two models of Radeon Mobility 9200 ("M9+") as
RV280-based chipsets (and as Mobility products).
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-01-27 05:54:19 UTC (rev 975)
+++ branches/4.3.0/sid/debian/changelog 2004-01-27 06:09:06 UTC (rev 976)
@@ -164,6 +164,10 @@
(Closes: #148775)
- debian/patches/022_r128_driver_pitch_tweak.diff
+ * Add recognition of two models of Radeon Mobility 9200 ("M9+") as
+ RV280-based chipsets (and as Mobility products).
+ - debian/patches/099_ati_recognize_radeon_9200_se.diff
+
-- Branden Robinson <branden@debian.org> Thu, 22 Jan 2004 23:21:45 -0500
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
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 2004-01-27 05:54:19 UTC (rev 975)
+++ branches/4.3.0/sid/debian/patches/099_ati_recognize_radeon_9200_se.diff 2004-01-27 06:09:06 UTC (rev 976)
@@ -1,14 +1,14 @@
$Id$
-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.
+Recognize the Radeon 9200 SE (RV280 5964) and two models of Radeon 9200
+Mobility. 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. Thanks
+also to Daniel Stone. Will be superseded by XFree86 4.4.
-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 @@
+diff -urN xc.orig/programs/Xserver/hw/xfree86/common/xf86PciInfo.h xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
+--- xc.orig/programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2004-01-14 13:19:13.000000000 +1100
++++ xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2004-01-14 13:29:08.000000000 +1100
+@@ -221,10 +221,13 @@
#define PCI_CHIP_RV280_5961 0x5961
#define PCI_CHIP_RV280_5962 0x5962
#define PCI_CHIP_RV280_5963 0x5963
@@ -16,25 +16,45 @@
#define PCI_CHIP_RV280_5968 0x5968
#define PCI_CHIP_RV280_5969 0x5969
#define PCI_CHIP_RV280_596A 0x596A
-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 @@
+ #define PCI_CHIP_RV280_596B 0x596B
++#define PCI_CHIP_RV280_5C61 0x5C61
++#define PCI_CHIP_RV280_5C63 0x5C63
+ /* Avance Logic */
+ #define PCI_CHIP_ALG2064 0x2064
+diff -urN xc.orig/programs/Xserver/hw/xfree86/drivers/ati/atichip.c xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c
+--- xc.orig/programs/Xserver/hw/xfree86/drivers/ati/atichip.c 2004-01-14 13:19:15.000000000 +1100
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/atichip.c 2004-01-14 18:09:23.000000000 +1100
+@@ -677,14 +677,12 @@
+
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 NewChipID('Y', 'h'):
+- case NewChipID('Y', 'i'):
+- case NewChipID('Y', 'j'):
+- case NewChipID('Y', 'k'):
++ case NewChipID('\\', 'a'):
++ case NewChipID('\\', 'c'):
+ return ATI_CHIP_RADEONMOBILITY9PLUS;
+
+ case NewChipID('A', 'D'):
+diff -urN xc.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
+--- xc.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2004-01-14 13:19:19.000000000 +1100
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2004-01-14 18:10:19.000000000 +1100
+@@ -1992,10 +1992,14 @@
+ info->ChipFamily = CHIP_FAMILY_M9;
+ break;
+
++ case PCI_CHIP_RV280_5C61:
++ case PCI_CHIP_RV280_5C63:
++ info->IsMobility = TRUE;
+ case PCI_CHIP_RV280_5960:
case PCI_CHIP_RV280_5961:
case PCI_CHIP_RV280_5962:
case PCI_CHIP_RV280_5963:
@@ -42,22 +62,27 @@
info->ChipFamily = CHIP_FAMILY_RV280;
break;
-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 @@
+diff -urN xc.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c
+--- xc.orig/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c 2004-01-14 13:19:19.000000000 +1100
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_probe.c 2004-01-14 18:12:57.000000000 +1100
+@@ -116,7 +116,10 @@
{ PCI_CHIP_RV280_5961, "ATI Radeon 9200 5961 (AGP)" },
{ PCI_CHIP_RV280_5962, "ATI Radeon 9200 5962 (AGP)" },
{ PCI_CHIP_RV280_5963, "ATI Radeon 9200 5963 (AGP)" },
+ { PCI_CHIP_RV280_5964, "ATI Radeon 9200 5964 (AGP)" },
{ PCI_CHIP_RV280_5968, "ATI Radeon M9+ 5968 (AGP)" },
++ { PCI_CHIP_RV280_5C61, "ATI Radeon Mobility 9200 (M9+) 5C61 (AGP)" },
++ { PCI_CHIP_RV280_5C63, "ATI Radeon Mobility 9200 (M9+) 5C63 (AGP)" },
{ PCI_CHIP_RV280_5969, "ATI Radeon M9+ 5969 (AGP)" },
{ PCI_CHIP_RV280_596A, "ATI Radeon M9+ 596A (AGP)" },
-@@ -174,6 +175,7 @@
+ { PCI_CHIP_RV280_596B, "ATI Radeon M9+ 596B (AGP)" },
+@@ -174,6 +177,9 @@
{ PCI_CHIP_RV280_5961, PCI_CHIP_RV280_5961, RES_SHARED_VGA },
{ PCI_CHIP_RV280_5962, PCI_CHIP_RV280_5962, RES_SHARED_VGA },
{ PCI_CHIP_RV280_5963, PCI_CHIP_RV280_5963, RES_SHARED_VGA },
+ { PCI_CHIP_RV280_5964, PCI_CHIP_RV280_5964, RES_SHARED_VGA },
++ { PCI_CHIP_RV280_5C61, PCI_CHIP_RV280_5C61, RES_SHARED_VGA },
++ { PCI_CHIP_RV280_5C63, PCI_CHIP_RV280_5C63, RES_SHARED_VGA },
{ PCI_CHIP_RV280_5968, PCI_CHIP_RV280_5968, RES_SHARED_VGA },
{ PCI_CHIP_RV280_5969, PCI_CHIP_RV280_5969, RES_SHARED_VGA },
{ PCI_CHIP_RV280_596A, PCI_CHIP_RV280_596A, RES_SHARED_VGA },
Reply to: