xf86-video-ati: Branch 'r6xx-r7xx-support'

[Alex Deucher]

 src/r600_exa.c |   80 ++++++++++++++++++++-------------------------------------
 1 file changed, 29 insertions(+), 51 deletions(-)

New commits:
commit 0dfadc1843e0d14b9cc1ee19a72f4fd60a2c495b
Author: Yang Zhao <yang at yangman.ca>
Date:   Fri Feb 6 10:29:39 2009 -0500

    r6xx/r7xx EXA: Optimize overlapping copy
    
    When source and destination blocks are only offset horizontally, it
    appears to be unnecessary to perform careful, segment-by-segment copy.
    The code path that does this is taken out completely.
    
    For the case where offset is only vertical, copying is now done by
    height of the non-overlapping area each time, instead of always
    line-by-line.

diff --git a/src/r600_exa.c b/src/r600_exa.c
index 80f8dd2..6f158e9 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -717,59 +717,37 @@ R600OverlapCopy(PixmapPtr pDst,
     struct radeon_accel_state *accel_state = info->accel_state;
     uint32_t dst_pitch = exaGetPixmapPitch(pDst) / (pDst->drawable.bitsPerPixel / 8);
     uint32_t dst_offset = exaGetPixmapOffset(pDst) + info->fbLocation + pScrn->fbOffset;
-    int i;
+    int i, chunk;
 
     if (is_overlap(srcX, srcX + w, srcY, srcY + h,
-		   dstX, dstX + w, dstY, dstY + h)) {
-	if (srcY == dstY) { // left/right
-	    if (srcX < dstX) { // right
-		// copy right to left
-		for (i = w; i > 0; i--) {
-		    R600DoPrepareCopy(pScrn,
-				      dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel,
-				      dst_pitch, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel,
-				      accel_state->rop, accel_state->planemask);
-
-		    R600AppendCopyVertex(pScrn, srcX + i - 1, srcY, dstX + i - 1, dstY, 1, h);
-		    R600DoCopy(pScrn);
-		}
-	    } else { //left
-		// copy left to right
-		for (i = 0; i < w; i++) {
-		    R600DoPrepareCopy(pScrn,
-				      dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel,
-				      dst_pitch, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel,
-				      accel_state->rop, accel_state->planemask);
-
-		    R600AppendCopyVertex(pScrn, srcX + i, srcY, dstX + i, dstY, 1, h);
-		    R600DoCopy(pScrn);
-		}
-	    }
-	} else { //up/down
-	    if (srcY > dstY) { // up
-		// copy top to bottom
-		for (i = 0; i < h; i++) {
-		    R600DoPrepareCopy(pScrn,
-				      dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel,
-				      dst_pitch, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel,
-				      accel_state->rop, accel_state->planemask);
-
-		    R600AppendCopyVertex(pScrn, srcX, srcY + i, dstX, dstY + i, w, 1);
-		    R600DoCopy(pScrn);
-		}
-	    } else { // down
-		// copy bottom to top
-		for (i = h; i > 0; i--) {
-		    R600DoPrepareCopy(pScrn,
-				      dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel,
-				      dst_pitch, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel,
-				      accel_state->rop, accel_state->planemask);
-
-		    R600AppendCopyVertex(pScrn, srcX, srcY + i - 1, dstX, dstY + i - 1, w, 1);
-		    R600DoCopy(pScrn);
-		}
-	    }
-	}
+		   dstX, dstX + w, dstY, dstY + h) && (srcY != dstY)) {
+        if (srcY > dstY) { // up
+            // copy top to bottom
+            chunk = srcY - dstY;
+            for (i = 0; i < h; i += chunk) {
+                if (chunk > h - i) chunk = h - i;
+                R600DoPrepareCopy(pScrn,
+                                  dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel,
+                                  dst_pitch, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel,
+                                  accel_state->rop, accel_state->planemask);
+
+                R600AppendCopyVertex(pScrn, srcX, srcY + i, dstX, dstY + i, w, chunk);
+                R600DoCopy(pScrn);
+            }
+        } else { // down
+            // copy bottom to top
+            chunk = dstY - srcY;
+            for (i = h; i > 0; i -= chunk) {
+                if (chunk > i) chunk = i;
+                R600DoPrepareCopy(pScrn,
+                                  dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel,
+                                  dst_pitch, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel,
+                                  accel_state->rop, accel_state->planemask);
+
+                R600AppendCopyVertex(pScrn, srcX, srcY + i - chunk, dstX, dstY + i - chunk, w, chunk);
+                R600DoCopy(pScrn);
+            }
+        }
     } else {
 	R600DoPrepareCopy(pScrn,
 			  dst_pitch, pDst->drawable.width, pDst->drawable.height, dst_offset, pDst->drawable.bitsPerPixel,