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

[Alex Deucher]

 src/r600_exa.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1b45936ae614244aa49b1a5d3c7fc39773c4f9b6
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Fri Feb 6 18:29:55 2009 -0500

    R6xx/R7xx EXA: Fix typo in DFS
    
    noticed by pzad in IRC

diff --git a/src/r600_exa.c b/src/r600_exa.c
index 7d5d7dc..a4e2a4d 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -2144,7 +2144,7 @@ R600DownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
 	return FALSE;
 
     scratch_mc_addr = info->gartLocation + info->dri->bufStart + (scratch->idx * scratch->total);
-    hpass = min(h, scratch->total/2 / scratch_pitch);
+    hpass = min(h, scratch->total/2 / scratch_pitch_bytes);
 
     //blit from vram to scratch
     R600DoPrepareCopy(pScrn,
@@ -2159,7 +2159,7 @@ R600DownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
 	int oldhpass = hpass;
 	h -= oldhpass;
 	y += oldhpass;
-	hpass = min(h, scratch->total/2 / scratch_pitch);
+	hpass = min(h, scratch->total/2 / scratch_pitch_bytes);
 
 	if (hpass) {
 	    scratch_offset = scratch->total/2 - scratch_offset;