xf86-video-ati: Branch 'master'

[Alex Deucher]

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

New commits:
commit bc93395b3eb5e3511c1b62af90693269f4fa6e13
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Wed Mar 31 22:30:24 2010 -0400

    r6xx+ EXA: fix swapped domains in kms UTS
    
    Noticed by Dave.
    
    Should fix fdo bug 27284

diff --git a/src/r600_exa.c b/src/r600_exa.c
index e34a471..59f4bfe 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -1928,13 +1928,13 @@ R600UploadToScreenCS(PixmapPtr pDst, int x, int y, int w, int h,
     if (!R600SetAccelState(pScrn,
 			   src_pitch_hw, w, h,
 			   0, scratch, bpp,
-			   RADEON_GEM_DOMAIN_VRAM,
+			   RADEON_GEM_DOMAIN_GTT,
 			   0, 0, 0,
 			   0, NULL, 0,
 			   0,
 			   dst_pitch_hw, pDst->drawable.width, pDst->drawable.height,
 			   0, radeon_get_pixmap_bo(pDst), bpp,
-			   RADEON_GEM_DOMAIN_GTT,
+			   RADEON_GEM_DOMAIN_VRAM,
 			   accel_state->copy_vs_offset, accel_state->copy_ps_offset,
 			   3, 0xffffffff)) {
         r = FALSE;