xf86-video-ati: Branch 'master'

[Michel Dänzer]

 src/evergreen_exa.c |    2 +-
 src/r600_exa.c      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e20284409937d784847339b5d466a95012d85940
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Fri Feb 3 12:21:59 2012 +0100

    EXA/r6xx+: Only set write domain or read domains, not both. (Bug #43893)
    
    Avoids an accounting bug in libdrm_radeon 2.4.31 or older.
    
    See https://bugs.freedesktop.org/show_bug.cgi?id=43893
    
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

diff --git a/src/evergreen_exa.c b/src/evergreen_exa.c
index ac0b5bb..9781069 100644
--- a/src/evergreen_exa.c
+++ b/src/evergreen_exa.c
@@ -515,7 +515,7 @@ EVERGREENPrepareCopy(PixmapPtr pSrc,   PixmapPtr pDst,
 	    RADEON_FALLBACK(("temp copy surface alloc failed\n"));
 
 	radeon_cs_space_add_persistent_bo(info->cs, accel_state->copy_area_bo,
-					  RADEON_GEM_DOMAIN_VRAM, RADEON_GEM_DOMAIN_VRAM);
+					  0, RADEON_GEM_DOMAIN_VRAM);
 	if (radeon_cs_space_check(info->cs)) {
 	    radeon_bo_unref(accel_state->copy_area_bo);
 	    accel_state->copy_area_bo = NULL;
diff --git a/src/r600_exa.c b/src/r600_exa.c
index 5306afd..8a53896 100644
--- a/src/r600_exa.c
+++ b/src/r600_exa.c
@@ -646,7 +646,7 @@ R600PrepareCopy(PixmapPtr pSrc,   PixmapPtr pDst,
 		RADEON_FALLBACK(("temp copy surface alloc failed\n"));
 
 	    radeon_cs_space_add_persistent_bo(info->cs, accel_state->copy_area_bo,
-					      RADEON_GEM_DOMAIN_VRAM, RADEON_GEM_DOMAIN_VRAM);
+					      0, RADEON_GEM_DOMAIN_VRAM);
 	    if (radeon_cs_space_check(info->cs)) {
 		radeon_bo_unref(accel_state->copy_area_bo);
 		accel_state->copy_area_bo = NULL;