xf86-video-ati: Branch 'ati-1-0-branch' - 3 commits

[Dave Airlie]

 configure.ac        |    2 +-
 src/radeon_accel.c  |   14 +++++++-------
 src/radeon_render.c |    8 ++++++++
 3 files changed, 16 insertions(+), 8 deletions(-)

New commits:
diff-tree 654b1a65c7d093793d15961422c2606ec2bc744a (from 84e574986f61c4f250d6ecb938bab20847618906)
Author: Dave Airlie <airlied at starflyer-ubuntu.(none)>
Date:   Tue Sep 12 03:41:08 2006 +1000

    update configure.ac for new release

diff --git a/configure.ac b/configure.ac
index 373fd76..19e3dd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-ati],
-        6.5.8.0,
+        6.5.8.1,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-ati)
 
diff-tree 84e574986f61c4f250d6ecb938bab20847618906 (from 487376cce72ef8f19b4e3dc742b53500bed7c480)
Author: Dave Airlie <airlied at starflyer-ubuntu.(none)>
Date:   Tue Sep 12 03:33:35 2006 +1000

    radeon: fallback render repeat for XAA, this fixes corruptions seen on ubuntu
    
    This isn't the correct fix, we should just fix the repeat case, but for a
    stable release this is much better idea

diff --git a/src/radeon_render.c b/src/radeon_render.c
index 0fab39f..88d4c52 100644
--- a/src/radeon_render.c
+++ b/src/radeon_render.c
@@ -389,6 +389,10 @@ static Bool FUNC_NAME(R100SetupTexture)(
 #endif
     ACCEL_PREAMBLE();
 
+    /* render repeat is broken - fix in stable tree by falling back */
+    if (flags & XAA_RENDER_REPEAT)
+	return FALSE;
+
     if ((width > 2048) || (height > 2048))
 	return FALSE;
 
@@ -721,6 +725,10 @@ static Bool FUNC_NAME(R200SetupTexture)(
 #endif
     ACCEL_PREAMBLE();
 
+    /* render repeat is broken - fix in stable tree by falling back */
+    if (flags & XAA_RENDER_REPEAT)
+	return FALSE;
+
     if ((width > 2048) || (height > 2048))
 	return FALSE;
 
diff-tree 487376cce72ef8f19b4e3dc742b53500bed7c480 (from cd9bbbcb9032c5dbb46802690de6196ca6db0084)
Author: Dave Airlie <airlied at starflyer-ubuntu.(none)>
Date:   Wed Aug 30 10:50:25 2006 +1000

    Bug #6761: Fix font rendering in non-DRI mode by replacing RB2D_DSTCACHE_*
           with RB3D_DSTCACHE_*. The RB2D versions are read-only mirrors of the
           RB3D. This is masked when DRI is enabled because the DRM uses the right
           registers in its flushing.

diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 0e0ede9..5c50cfa 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -154,16 +154,16 @@ void RADEONEngineFlush(ScrnInfoPtr pScrn
     unsigned char *RADEONMMIO = info->MMIO;
     int            i;
 
-    OUTREGP(RADEON_RB2D_DSTCACHE_CTLSTAT,
-	    RADEON_RB2D_DC_FLUSH_ALL,
-	    ~RADEON_RB2D_DC_FLUSH_ALL);
+    OUTREGP(RADEON_RB3D_DSTCACHE_CTLSTAT,
+	    RADEON_RB3D_DC_FLUSH_ALL,
+	    ~RADEON_RB3D_DC_FLUSH_ALL);
     for (i = 0; i < RADEON_TIMEOUT; i++) {
-	if (!(INREG(RADEON_RB2D_DSTCACHE_CTLSTAT) & RADEON_RB2D_DC_BUSY))
+	if (!(INREG(RADEON_RB3D_DSTCACHE_CTLSTAT) & RADEON_RB3D_DC_BUSY))
 	    break;
     }
     if (i == RADEON_TIMEOUT) {
 	RADEONTRACE(("DC flush timeout: %x\n",
-		    INREG(RADEON_RB2D_DSTCACHE_CTLSTAT)));
+		    INREG(RADEON_RB3D_DSTCACHE_CTLSTAT)));
     }
 }
 
@@ -254,8 +254,8 @@ void RADEONEngineReset(ScrnInfoPtr pScrn
 					RADEON_SOFT_RESET_E2));
 	INREG(RADEON_RBBM_SOFT_RESET);
 	OUTREG(RADEON_RBBM_SOFT_RESET, 0);
-	tmp = INREG(RADEON_RB2D_DSTCACHE_MODE);
-	OUTREG(RADEON_RB2D_DSTCACHE_MODE, tmp | (1 << 17)); /* FIXME */
+	tmp = INREG(RADEON_RB3D_DSTCACHE_MODE);
+	OUTREG(RADEON_RB3D_DSTCACHE_MODE, tmp | (1 << 17)); /* FIXME */
     } else {
 	OUTREG(RADEON_RBBM_SOFT_RESET, (rbbm_soft_reset |
 					RADEON_SOFT_RESET_CP |