rpms/xorg-x11-drv-ati/F-10 radeon-modeset.patch, 1.45, 1.46 xorg-x11-drv-ati.spec, 1.157, 1.158

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8442

Modified Files:
	radeon-modeset.patch xorg-x11-drv-ati.spec 
Log Message:
- radeon/kms: hopefully fix some rs690 stability issues


radeon-modeset.patch:

Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10/radeon-modeset.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- radeon-modeset.patch	23 Nov 2008 08:15:29 -0000	1.45
+++ radeon-modeset.patch	25 Nov 2008 06:28:07 -0000	1.46
@@ -1,3 +1,13 @@
+commit bc3caa80847c6652e6e6056e9ab32576d5ef179c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Nov 25 17:20:44 2008 +1100
+
+    radeon: rs690 stabilisation fixes.
+    
+    Flush the VAP due a IB hang on the VAP setup regs.
+    Flush the TX earlier.
+    Emit a right to SC_CLIP_RULE to flush as per r500 docs.
+
 commit 0e9f5f28a24d297d3fcd59dcebd4a6a74e4110dd
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Sun Nov 23 18:10:41 2008 +1000
@@ -7199,7 +7209,7 @@
      xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Setting EXA maxPitchBytes\n");
  
 diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
-index 97199ae..ed82878 100644
+index 97199ae..052892b 100644
 --- a/src/radeon_exa_render.c
 +++ b/src/radeon_exa_render.c
 @@ -355,12 +355,14 @@ static Bool FUNC_NAME(R100TextureSetup)(PicturePtr pPict, PixmapPtr pPix,
@@ -7683,16 +7693,20 @@
  	RADEON_FALLBACK(("Bad destination offset 0x%x\n", (int)dst_offset));
      if (((dst_pitch >> pixel_shift) & 0x7) != 0)
  	RADEON_FALLBACK(("Bad destination pitch 0x%x\n", (int)dst_pitch));
-@@ -1218,6 +1437,8 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
+@@ -1218,6 +1437,12 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
      if (!RADEONSetupSourceTile(pSrcPicture, pSrc, TRUE, FALSE))
  	return FALSE;
  
 +    RADEON_SWITCH_TO_3D();
++    BEGIN_ACCEL(2);
++    OUT_ACCEL_REG(R300_TX_INVALTAGS, 0x0);
++    OUT_ACCEL_REG(R300_VAP_PVS_STATE_FLUSH_REG, 0);
++    FINISH_ACCEL();
 +
      if (!FUNC_NAME(R300TextureSetup)(pSrcPicture, pSrc, 0))
  	return FALSE;
      txenable = R300_TEX_0_ENABLE;
-@@ -1230,7 +1451,6 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
+@@ -1230,7 +1455,6 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
  	info->accel_state->is_transform[1] = FALSE;
      }
  
@@ -7700,7 +7714,7 @@
  
      /* setup the VAP */
      if (info->accel_state->has_tcl) {
-@@ -1829,9 +2049,18 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
+@@ -1829,9 +2053,18 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
  	FINISH_ACCEL();
      }
  
@@ -7721,6 +7735,28 @@
      OUT_ACCEL_REG(R300_RB3D_COLORPITCH0, colorpitch);
  
      blendcntl = RADEONGetBlendCntl(op, pMaskPicture, pDstPicture->format);
+@@ -2037,9 +2270,10 @@ static void FUNC_NAME(RadeonCompositeTile)(PixmapPtr pDst,
+ 		xFixedToFloat(srcTopRight.x) / info->accel_state->texW[0],     xFixedToFloat(srcTopRight.y) / info->accel_state->texH[0]);
+     }
+ 
+-    if (IS_R300_3D || IS_R500_3D)
++    if (IS_R300_3D || IS_R500_3D) {
+ 	/* flushing is pipelined, free/finish is not */
+ 	OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_DC_FLUSH_3D);
++    }
+ 
+ #ifdef ACCEL_CP
+     ADVANCE_RING();
+@@ -2121,7 +2355,8 @@ static void FUNC_NAME(RadeonDoneComposite)(PixmapPtr pDst)
+     ENTER_DRAW(0);
+ 
+     if (IS_R300_3D || IS_R500_3D) {
+-	BEGIN_ACCEL(2);
++	BEGIN_ACCEL(3);
++	OUT_ACCEL_REG(R300_SC_CLIP_RULE, 0xaaaa);
+ 	OUT_ACCEL_REG(R300_RB3D_DSTCACHE_CTLSTAT, R300_RB3D_DC_FLUSH_ALL);
+     } else
+ 	BEGIN_ACCEL(1);
 diff --git a/src/radeon_legacy_memory.c b/src/radeon_legacy_memory.c
 index 2a9ee94..0423571 100644
 --- a/src/radeon_legacy_memory.c


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10/xorg-x11-drv-ati.spec,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- xorg-x11-drv-ati.spec	23 Nov 2008 08:15:29 -0000	1.157
+++ xorg-x11-drv-ati.spec	25 Nov 2008 06:28:07 -0000	1.158
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   56%{?dist}
+Release:   57%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -82,6 +82,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Nov 25 2008 Dave Airlie <airlied at redhat.com> 6.9.0-57
+- radeon/kms: hopefully fix some rs690 stability issues
+
 * Sun Nov 23 2008 Dave Airlie <airlied at redhat.com> 6.9.0-56
 - fix some issues with UTS and 2d state flush