xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/r6xx_accel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b13d719080b75fc6db4d15d2d323b8fce8b7ad06
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Mon Jun 21 18:49:44 2010 -0400

    r6xx/r7xx: fix miscount in state emit

diff --git a/src/r6xx_accel.c b/src/r6xx_accel.c
index 603b271..c8ef451 100644
--- a/src/r6xx_accel.c
+++ b/src/r6xx_accel.c
@@ -979,7 +979,7 @@ set_default_state(ScrnInfoPtr pScrn, drmBufPtr ib)
     for (i = 0; i < PA_SC_VPORT_SCISSOR_0_TL_num; i++)
 	set_vport_scissor (pScrn, ib, i, 0, 0, 8192, 8192);
 
-    BEGIN_BATCH(40);
+    BEGIN_BATCH(42);
     PACK0(ib, PA_SC_MPASS_PS_CNTL, 2);
     E32(ib, 0);
     if (info->ChipFamily < CHIP_FAMILY_RV770)