summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2020-11-16 15:09:14 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2020-11-16 15:23:28 +0000
commitad5540f6ecaec287c70259f0181e613561b716f6 (patch)
tree5fc907454a1bf79711a9e0ca82d3fc0cde85f700
parent4e8ae05f20e43c56ee7b15bbc66a472d4361a777 (diff)
More ABI changes for ABI_VIDEODRV_VERSION 25.2
Descending down into the naming changes, onto the next struct in the chain. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/compat-api.h2
-rw-r--r--src/sna/sna_accel.c2
-rw-r--r--src/uxa/intel_driver.c6
3 files changed, 6 insertions, 4 deletions
diff --git a/src/compat-api.h b/src/compat-api.h
index 336698d3..4bb6be45 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -262,8 +262,10 @@ static inline void FreePixmap(PixmapPtr pixmap)
#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(25, 2)
#define PixmapDirtyDst(d) ((d)->secondary_dst)
+#define PixmapDirtyPrimary(d) (PixmapDirtyDst(d)->primary_pixmap)
#else
#define PixmapDirtyDst(d) ((d)->slave_dst)
+#define PixmapDirtyPrimary(d) (PixmapDirtyDst(d)->master_pixmap)
#endif
#endif
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 6d2fb352..89b82afa 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -17696,7 +17696,7 @@ static void sna_accel_post_damage(struct sna *sna)
#else
src = dirty->src;
#endif
- dst = PixmapDirtyDst(dirty)->master_pixmap;
+ dst = PixmapDirtyPrimary(dirty);
region.extents.x1 = dirty->x;
region.extents.x2 = dirty->x + dst->drawable.width;
diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
index ffd35db4..9c3fe85f 100644
--- a/src/uxa/intel_driver.c
+++ b/src/uxa/intel_driver.c
@@ -624,7 +624,7 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
RegionRec pixregion;
int was_blocked;
- PixmapRegionInit(&pixregion, PixmapDirtyDst(dirty)->master_pixmap);
+ PixmapRegionInit(&pixregion, PixmapDirtyPrimary(dirty));
RegionTranslate(&pixregion, dirty->x, dirty->y);
RegionIntersect(&pixregion, &pixregion, DamageRegion(dirty->damage));
RegionTranslate(&pixregion, -dirty->x, -dirty->y);
@@ -634,13 +634,13 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
if (was_blocked)
return;
- PixmapRegionInit(&pixregion, PixmapDirtyDst(dirty)->master_pixmap);
+ PixmapRegionInit(&pixregion, PixmapDirtyPrimary(dirty));
PixmapSyncDirtyHelper(dirty, &pixregion);
RegionUninit(&pixregion);
intel_flush(intel);
if (!intel->has_prime_vmap_flush) {
- drm_intel_bo *bo = intel_uxa_get_pixmap_bo(PixmapDirtyDst(dirty)->master_pixmap);
+ drm_intel_bo *bo = intel_uxa_get_pixmap_bo(PixmapDirtyPrimary(dirty));
was_blocked = xf86BlockSIGIO();
drm_intel_bo_map(bo, FALSE);
drm_intel_bo_unmap(bo);