xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_commonfuncs.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 37614e1db9a595fbe8a21d7a045895e11d272db9
Author: Alex Deucher <alex at botch2.com>
Date:   Tue Apr 15 09:48:16 2008 -0400

    fix up some things from the last commit

diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index 1976805..0b99a03 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -152,14 +152,15 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
 
 	if (info->ChipFamily == CHIP_FAMILY_RV515)
 	    vap_cntl |= (2 << R300_PVS_NUM_FPUS_SHIFT);
-	else if (info->ChipFamily == CHIP_FAMILY_RV530)
+	else if ((info->ChipFamily == CHIP_FAMILY_RV530) ||
+		 (info->ChipFamily == CHIP_FAMILY_RV560))
 	    vap_cntl |= (5 << R300_PVS_NUM_FPUS_SHIFT);
 	else if (info->ChipFamily == CHIP_FAMILY_R420)
 	    vap_cntl |= (6 << R300_PVS_NUM_FPUS_SHIFT);
-	else if (info->ChipFamily == CHIP_FAMILY_R520)
+	else if ((info->ChipFamily == CHIP_FAMILY_R520) ||
+		 (info->ChipFamily == CHIP_FAMILY_R580) ||
+		 (info->ChipFamily == CHIP_FAMILY_RV570))
 	    vap_cntl |= (8 << R300_PVS_NUM_FPUS_SHIFT);
-	else if (info->ChipFamily == CHIP_FAMILY_RV530)
-	    vap_cntl |= (5 << R300_PVS_NUM_FPUS_SHIFT);
 	else
 	    vap_cntl |= (4 << R300_PVS_NUM_FPUS_SHIFT);