xf86-video-ati: Branch 'master'

[Dave Airlie]

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

New commits:
commit e4b2d57ddca8739ec0b452565713398d036be0d5
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Aug 24 14:11:24 2009 +1000

    r600: fix bad unit in texture setup

diff --git a/src/r600_exa.c b/src/r600_exa.c
index 979bb73..578a473 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -1098,10 +1098,10 @@ static Bool R600TextureSetup(PicturePtr pPict, PixmapPtr pPix,
     accel_state->src_pitch[unit] = exaGetPixmapPitch(pPix) / (pPix->drawable.bitsPerPixel / 8);
     accel_state->src_size[unit] = exaGetPixmapPitch(pPix) * pPix->drawable.height;
 
-    if (accel_state->src_pitch[1] & 7)
+    if (accel_state->src_pitch[unit] & 7)
 	RADEON_FALLBACK(("Bad pitch %d 0x%x\n", (int)accel_state->src_pitch[unit], unit));
 
-    if (accel_state->src_mc_addr[1] & 0xff)
+    if (accel_state->src_mc_addr[unit] & 0xff)
 	RADEON_FALLBACK(("Bad offset %d 0x%x\n", (int)accel_state->src_mc_addr[unit], unit));
 
     for (i = 0; i < sizeof(R600TexFormats) / sizeof(R600TexFormats[0]); i++) {