diff options
| -rw-r--r-- | driver/xf86-video-intel/src/sna/sna_accel.c | 6 | ||||
| -rw-r--r-- | driver/xf86-video-intel/src/uxa/intel_driver.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/driver/xf86-video-intel/src/sna/sna_accel.c b/driver/xf86-video-intel/src/sna/sna_accel.c index 0e8519534..502e1611d 100644 --- a/driver/xf86-video-intel/src/sna/sna_accel.c +++ b/driver/xf86-video-intel/src/sna/sna_accel.c @@ -17266,7 +17266,7 @@ static void sna_accel_post_damage(struct sna *sna) continue; src = dirty->src; - dst = dirty->slave_dst->master_pixmap; + dst = dirty->secondary_dst->primary_pixmap; region.extents.x1 = dirty->x; region.extents.x2 = dirty->x + dst->drawable.width; @@ -17293,7 +17293,7 @@ static void sna_accel_post_damage(struct sna *sna) dy += dirty->dst_y; #endif RegionTranslate(®ion, dx, dy); - DamageRegionAppend(&dirty->slave_dst->drawable, ®ion); + DamageRegionAppend(&dirty->secondary_dst->drawable, ®ion); DBG(("%s: slave: ((%d, %d), (%d, %d))x%d\n", __FUNCTION__, region.extents.x1, region.extents.y1, @@ -17363,7 +17363,7 @@ fallback: flush = true; } - DamageRegionProcessPending(&dirty->slave_dst->drawable); + DamageRegionProcessPending(&dirty->secondary_dst->drawable); skip: RegionUninit(®ion); DamageEmpty(dirty->damage); diff --git a/driver/xf86-video-intel/src/uxa/intel_driver.c b/driver/xf86-video-intel/src/uxa/intel_driver.c index 347bda49a..69a89c292 100644 --- a/driver/xf86-video-intel/src/uxa/intel_driver.c +++ b/driver/xf86-video-intel/src/uxa/intel_driver.c @@ -644,30 +644,30 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) RegionRec pixregion; int was_blocked; - PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap); + PixmapRegionInit(&pixregion, dirty->secondary_dst->primary_pixmap); RegionTranslate(&pixregion, dirty->x, dirty->y); RegionIntersect(&pixregion, &pixregion, DamageRegion(dirty->damage)); RegionTranslate(&pixregion, -dirty->x, -dirty->y); was_blocked = RegionNil(&pixregion); - DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); + DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion); RegionUninit(&pixregion); if (was_blocked) return; - PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap); + PixmapRegionInit(&pixregion, dirty->secondary_dst->primary_pixmap); PixmapSyncDirtyHelper(dirty, &pixregion); RegionUninit(&pixregion); intel_batch_submit(scrn); if (!intel->has_prime_vmap_flush) { - drm_intel_bo *bo = intel_get_pixmap_bo(dirty->slave_dst->master_pixmap); + drm_intel_bo *bo = intel_get_pixmap_bo(dirty->secondary_dst->primary_pixmap); was_blocked = xf86BlockSIGIO(); drm_intel_bo_map(bo, FALSE); drm_intel_bo_unmap(bo); xf86UnblockSIGIO(was_blocked); } - DamageRegionProcessPending(&dirty->slave_dst->drawable); + DamageRegionProcessPending(&dirty->secondary_dst->drawable); return; } |