xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_commonfuncs.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 070cce5255a5c311f9d8b85ec54bd56655014933
Author: Stephan Wolf <stephan at letzte-bankreihe.de>
Date:   Mon Apr 28 11:26:37 2008 -0400

    R3xx+: further fix for IGP chips
    
    see bug 15538

diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index e504979..9a450f9 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -146,9 +146,14 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
 	FINISH_ACCEL();
 
 	/* setup the VAP */
-	vap_cntl = ((5 << R300_PVS_NUM_SLOTS_SHIFT) |
-		    (5 << R300_PVS_NUM_CNTLRS_SHIFT) |
-		    (9/*12*/ << R300_VF_MAX_VTX_NUM_SHIFT));
+	if (info->has_tcl)
+	    vap_cntl = ((5 << R300_PVS_NUM_SLOTS_SHIFT) |
+			(5 << R300_PVS_NUM_CNTLRS_SHIFT) |
+			(9 << R300_VF_MAX_VTX_NUM_SHIFT));
+	else
+	    vap_cntl = ((10 << R300_PVS_NUM_SLOTS_SHIFT) |
+			(5 << R300_PVS_NUM_CNTLRS_SHIFT) |
+			(5 << R300_VF_MAX_VTX_NUM_SHIFT));
 
 	if (info->ChipFamily == CHIP_FAMILY_RV515)
 	    vap_cntl |= (2 << R300_PVS_NUM_FPUS_SHIFT);