summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Rutkovsky <vrutkovs@redhat.com>2015-07-09 23:23:37 +0200
committerIlia Mirkin <imirkin@alum.mit.edu>2015-07-11 16:58:28 -0400
commitfdc528306e4018b314f2efcb2be4e37672bddd75 (patch)
tree85e0e2db8f1b282eade17ecb0a5a6391cbb99f2b
parentdfd827cefb940f46b18dc77c129f0a603c7c95fa (diff)
Adapt to new dirty tracking api
Mirrors commit b6d871bf2 (radeon: adopt for new X server dirty tracking APIs.) in xf86-video-ati. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91284
-rw-r--r--src/drmmode_display.c4
-rw-r--r--src/nv_driver.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index c30cb3a..cd13820 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -729,7 +729,9 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
screen->height = screenpix->drawable.height = max_height;
}
drmmode_crtc->scanout_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);
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 8e2ae03..4218e4f 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -557,7 +557,11 @@ 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);