xf86-video-amdgpu: Branch 'master'

[Michel Dänzer]

 src/amdgpu_kms.c      |    4 ++++
 src/drmmode_display.c |    4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 159c5d460a330cf0a24678f3c6c3e2fbaf23c571
Author: Dave Airlie <airlied at gmail.com>
Date:   Tue Jul 14 17:04:14 2015 +0900

    Adopt for new X server dirty tracking APIs.
    
    Signed-off-by: Dave Airlie <airlied at redhat.com>
    
    (Ported from radeon commit b6d871bf299c7d0f106c07ee4d8bd3b2337f53cc)
    
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index f6ccbd4..2019155 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -188,7 +188,11 @@ static void redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
 
 	PixmapRegionInit(&pixregion, dirty->slave_dst);
 	DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
+#ifdef HAS_DIRTYTRACKING_ROTATION
+	PixmapSyncDirtyHelper(dirty);
+#else
 	PixmapSyncDirtyHelper(dirty, &pixregion);
+#endif
 
 	DamageRegionProcessPending(&dirty->slave_dst->drawable);
 	RegionUninit(&pixregion);
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index 7e0af1a..bce6774 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -796,7 +796,9 @@ static Bool drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
 		screen->height = screenpix->drawable.height = max_height;
 	}
 	drmmode_crtc->prime_pixmap_x = this_x;
-#ifdef HAS_DIRTYTRACKING2
+#ifdef HAS_DIRTYTRACKING_ROTATION
+	PixmapStartDirtyTracking(ppix, screenpix, 0, 0, this_x, 0, RR_Rotate_0);
+#elif defined(HAS_DIRTYTRACKING2)
 	PixmapStartDirtyTracking2(ppix, screenpix, 0, 0, this_x, 0);
 #else
 	PixmapStartDirtyTracking(ppix, screenpix, 0, 0);