xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_commonfuncs.c |    4 +++-
 src/radeon_exa_render.c  |    3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 9243791322e36b9231e6a3f04024ad66325385e3
Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Aug 7 14:07:32 2009 +1000

    r200: fixup scissors for DDX.
    
    a) turn of R200_RE_CNTL - SCISSOR_ENABLE - this save us emitting R200_RE_TOP_LEFT, note scissor is still enabled.
    b) disable aux scissors.

diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
index 6f501a6..b6a6d8d 100644
--- a/src/radeon_commonfuncs.c
+++ b/src/radeon_commonfuncs.c
@@ -789,7 +789,9 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
 	    R200_VAP_VF_MAX_VTX_NUM);
 	FINISH_ACCEL();
 
-	BEGIN_ACCEL(3);
+	BEGIN_ACCEL(5);
+	OUT_ACCEL_REG(R200_RE_AUX_SCISSOR_CNTL, 0);
+	OUT_ACCEL_REG(R200_RE_CNTL, 0);
 	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 |
diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
index 9cd70cd..c35ecba 100644
--- a/src/radeon_exa_render.c
+++ b/src/radeon_exa_render.c
@@ -968,7 +968,7 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
 	info->accel_state->is_transform[1] = FALSE;
     }
 
-    BEGIN_ACCEL_RELOC(13, 2);
+    BEGIN_ACCEL_RELOC(12, 2);
 
     OUT_ACCEL_REG(RADEON_PP_CNTL, pp_cntl);
     OUT_ACCEL_REG(RADEON_RB3D_CNTL, dst_format | RADEON_ALPHA_BLEND_ENABLE);
@@ -1031,7 +1031,6 @@ static Bool FUNC_NAME(R200PrepareComposite)(int op, PicturePtr pSrcPicture,
     blendcntl = RADEONGetBlendCntl(op, pMaskPicture, pDstPicture->format);
     OUT_ACCEL_REG(RADEON_RB3D_BLENDCNTL, blendcntl);
 
-    OUT_ACCEL_REG(RADEON_RE_TOP_LEFT, 0);
     OUT_ACCEL_REG(RADEON_RE_WIDTH_HEIGHT, (((pDst->drawable.width) << RADEON_RE_WIDTH_SHIFT) |
 					   ((pDst->drawable.height) << RADEON_RE_HEIGHT_SHIFT)));