xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit e8e0bb1ba29761c94d473e42ca6ada161cfff557
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Jun 12 11:07:43 2009 -0400

    Fix count in 3d state setup after 43374c7420e378918bec062f4cbd581f16adb6f0

diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index 63aae92..6ea0513 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -775,7 +775,7 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
 	    R200_VAP_VF_MAX_VTX_NUM);
 	FINISH_ACCEL();
 
-	BEGIN_ACCEL(5);
+	BEGIN_ACCEL(3);
 	OUT_ACCEL_REG(RADEON_AUX_SC_CNTL, 0);
 	OUT_ACCEL_REG(RADEON_RB3D_PLANEMASK, 0xffffffff);
 	OUT_ACCEL_REG(RADEON_SE_CNTL, (RADEON_DIFFUSE_SHADE_GOURAUD |
@@ -797,7 +797,7 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
 		      RADEON_TEX1_W_ROUTING_USE_W0);
 	FINISH_ACCEL();
 
-	BEGIN_ACCEL(5);
+	BEGIN_ACCEL(3);
 	OUT_ACCEL_REG(RADEON_AUX_SC_CNTL, 0);
 	OUT_ACCEL_REG(RADEON_RB3D_PLANEMASK, 0xffffffff);
 	OUT_ACCEL_REG(RADEON_SE_CNTL, (RADEON_DIFFUSE_SHADE_GOURAUD |