xf86-video-ati: Branch 'master'

[Dave Airlie]

 src/radeon_kms.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 857d729eb3672443f89c0516f8226eacb37dad2b
Author: Dave Airlie <airlied at redhat.com>
Date:   Mon Jan 7 14:13:33 2013 +1000

    radeon: fix damage reporting for slave pixmaps
    
    This is definitely more correct, not sure if it'll fix any bugs.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>

diff --git a/src/radeon_kms.c b/src/radeon_kms.c
index 8e8544e..2265b17 100644
--- a/src/radeon_kms.c
+++ b/src/radeon_kms.c
@@ -245,10 +245,11 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
 	RegionRec pixregion;
 
 	PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap);
+	DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
 	PixmapSyncDirtyHelper(dirty, &pixregion);
 
 	radeon_cs_flush_indirect(pScrn);
-	DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
+	DamageRegionProcessPending(&dirty->slave_dst->drawable);
 	RegionUninit(&pixregion);
 }