summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2008-07-11 19:05:00 -0400
committerBrice Goglin <bgoglin@debian.org>2008-08-02 18:47:30 +0200
commitc13760f21455eeaf2e9940913f82c9dff648de82 (patch)
tree2ff294f722fc390804664e2a33ba9fed7fa33983
parent905750745de646ff6ed2faed0f732c74c2791292 (diff)
downloadxf86-video-ati-frc-c13760f21455eeaf2e9940913f82c9dff648de82.tar.gz
xf86-video-ati-frc-c13760f21455eeaf2e9940913f82c9dff648de82.tar.bz2
R300: NUM_FPU adjustments for VAP_CNTL
(cherry picked from commit ab14f725676e4d4e45278c64b03fe2d328a3e439)
-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 58fe306..d0c5229 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -158,13 +158,14 @@ 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) ||
- (info->ChipFamily == CHIP_FAMILY_RV560))
+ (info->ChipFamily == CHIP_FAMILY_RV560) ||
+ (info->ChipFamily == CHIP_FAMILY_RV570))
vap_cntl |= (5 << R300_PVS_NUM_FPUS_SHIFT);
- else if (info->ChipFamily == CHIP_FAMILY_R420)
+ else if ((info->ChipFamily == CHIP_FAMILY_RV410) ||
+ (info->ChipFamily == CHIP_FAMILY_R420))
vap_cntl |= (6 << R300_PVS_NUM_FPUS_SHIFT);
else if ((info->ChipFamily == CHIP_FAMILY_R520) ||
- (info->ChipFamily == CHIP_FAMILY_R580) ||
- (info->ChipFamily == CHIP_FAMILY_RV570))
+ (info->ChipFamily == CHIP_FAMILY_R580))
vap_cntl |= (8 << R300_PVS_NUM_FPUS_SHIFT);
else
vap_cntl |= (4 << R300_PVS_NUM_FPUS_SHIFT);