Author: daenzer
Date: 2004-01-14 17:03:34 -0500 (Wed, 14 Jan 2004)
New Revision: 913
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/030b_radeon_rv280_support.diff
Log:
Fix initialisation of some DRI parameters for RV280 chips (and possibly
others with the R200 3D core). (Closes: #225759)
- debian/patches/030b_radeon_rv280_support.diff
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-01-14 21:13:24 UTC (rev 912)
+++ branches/4.3.0/sid/debian/changelog 2004-01-14 22:03:34 UTC (rev 913)
@@ -74,6 +74,11 @@
- debian/po/{templates.pot,*.po}: cosmetic updates made by
debconf-updatepo
+ * Fix initialisation of some DRI parameters for RV280 chips (and possibly
+ others with the R200 3D core). (Closes: #225759)
+ - debian/patches/030b_radeon_rv280_support.diff
+ [Michel Dänzer]
+
-- Branden Robinson <[EMAIL PROTECTED]> Wed, 14 Jan 2004 13:12:27 -0500
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
Modified: branches/4.3.0/sid/debian/patches/030b_radeon_rv280_support.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/030b_radeon_rv280_support.diff
2004-01-14 21:13:24 UTC (rev 912)
+++ branches/4.3.0/sid/debian/patches/030b_radeon_rv280_support.diff
2004-01-14 22:03:34 UTC (rev 913)
@@ -144,13 +144,40 @@
{ PCI_CHIP_R300_AD, PCI_CHIP_R300_AD, RES_SHARED_VGA },
{ PCI_CHIP_R300_AE, PCI_CHIP_R300_AE, RES_SHARED_VGA },
{ PCI_CHIP_R300_AF, PCI_CHIP_R300_AF, RES_SHARED_VGA },
---- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_version.h.2_rv280
Fri Mar 7 06:56:11 2003
-+++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_version.h Fri Mar
7 06:56:31 2003
-@@ -39,6 +39,7 @@
- #define RADEON_DRIVER_NAME "radeon"
- #define R200_DRIVER_NAME "r200"
- #define RV250_DRIVER_NAME "r200"
-+#define RV280_DRIVER_NAME "r200"
+--- xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c 6 May 2003
23:21:38 -0000 1.32.2.1
++++ xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_dri.c 1 Jan 2004
17:43:38 -0000
+@@ -1008,9 +1008,7 @@ static int RADEONDRIKernelInit(RADEONInf
- #define RADEON_VERSION_MAJOR 4
- #define RADEON_VERSION_MINOR 0
+ memset(&drmInfo, 0, sizeof(drmRadeonInit));
+
+- if ( (info->ChipFamily == CHIP_FAMILY_R200) ||
+- (info->ChipFamily == CHIP_FAMILY_RV250) ||
+- (info->ChipFamily == CHIP_FAMILY_M9) )
++ if ( info->ChipFamily >= CHIP_FAMILY_R200 )
+ drmInfo.func = DRM_RADEON_INIT_R200_CP;
+ else
+ drmInfo.func = DRM_RADEON_INIT_CP;
+@@ -1226,11 +1224,8 @@ Bool RADEONDRIScreenInit(ScreenPtr pScre
+ info->pDRIInfo = pDRIInfo;
+ pDRIInfo->drmDriverName = RADEON_DRIVER_NAME;
+
+- if (info->ChipFamily == CHIP_FAMILY_R200)
++ if ( info->ChipFamily >= CHIP_FAMILY_R200 )
+ pDRIInfo->clientDriverName = R200_DRIVER_NAME;
+- else if ((info->ChipFamily == CHIP_FAMILY_RV250) ||
+- (info->ChipFamily == CHIP_FAMILY_M9))
+- pDRIInfo->clientDriverName = RV250_DRIVER_NAME;
+ else
+ pDRIInfo->clientDriverName = RADEON_DRIVER_NAME;
+
+@@ -1354,9 +1349,7 @@ Bool RADEONDRIScreenInit(ScreenPtr pScre
+ if (version) {
+ int req_minor, req_patch;
+
+- if ((info->ChipFamily == CHIP_FAMILY_R200) ||
+- (info->ChipFamily == CHIP_FAMILY_RV250) ||
+- (info->ChipFamily == CHIP_FAMILY_M9)) {
++ if ( info->ChipFamily >= CHIP_FAMILY_R200 ) {
+ req_minor = 5;
+ req_patch = 0;
+ } else {
