summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alex@botch2.com>2008-04-15 09:48:16 -0400
committerAlex Deucher <alex@botch2.com>2008-04-15 09:48:16 -0400
commit37614e1db9a595fbe8a21d7a045895e11d272db9 (patch)
tree1dbe0e43b456e767cee06cdf46c3e292c8bfa6eb
parent1286fe5ce1c77453d57817b9b26b1bdb32ca7bc8 (diff)
fix up some things from the last commit
-rw-r--r--src/radeon_commonfuncs.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index 1976805d..0b99a035 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);