pc.patch

   1 diff -ur xf86-video-intel-2.99.917/src/sna/sna_accel.c xf86-video-intel-2.99.917-pc/src/sna/sna_accel.c
   2 --- xf86-video-intel-2.99.917/src/sna/sna_accel.c       2021-11-03 16:24:27.669484747 +0100
   3 +++ xf86-video-intel-2.99.917-pc/src/sna/sna_accel.c    2021-11-03 16:22:30.753591499 +0100
   4 @@ -17672,7 +17672,7 @@
   5                         continue;
   6
   7                 src = dirty->src;
   8 -               dst = dirty->slave_dst->master_pixmap;
   9 +               dst = dirty->secondary_dst->primary_pixmap;
  10
  11                 region.extents.x1 = dirty->x;
  12                 region.extents.x2 = dirty->x + dst->drawable.width;
  13 @@ -17699,7 +17699,7 @@
  14                 dy += dirty->dst_y;
  15  #endif
  16                 RegionTranslate(&region, dx, dy);
  17 -               DamageRegionAppend(&dirty->slave_dst->drawable, &region);
  18 +               DamageRegionAppend(&dirty->secondary_dst->drawable, &region);
  19
  20                 DBG(("%s: slave:  ((%d, %d), (%d, %d))x%d\n", __FUNCTION__,
  21                      region.extents.x1, region.extents.y1,
  22 @@ -17776,7 +17776,7 @@
  23                         kgem_bo_sync__gtt(&sna->kgem, __sna_pixmap_get_bo(dst));
  24                 }
  25
  26 -               DamageRegionProcessPending(&dirty->slave_dst->drawable);
  27 +               DamageRegionProcessPending(&dirty->secondary_dst->drawable);
  28  skip:
  29                 RegionUninit(&region);
  30                 DamageEmpty(dirty->damage);
  31 diff -ur xf86-video-intel-2.99.917/src/uxa/intel_driver.c xf86-video-intel-2.99.917-pc/src/uxa/intel_driver.c
  32 --- xf86-video-intel-2.99.917/src/uxa/intel_driver.c    2021-11-03 16:24:27.676151157 +0100
  33 +++ xf86-video-intel-2.99.917-pc/src/uxa/intel_driver.c 2021-11-03 16:23:43.264480387 +0100
  34 @@ -624,30 +624,30 @@
  35         RegionRec pixregion;
  36         int was_blocked;
  37
  38 -       PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap);
  39 +       PixmapRegionInit(&pixregion, dirty->secondary_dst->primary_pixmap);
  40         RegionTranslate(&pixregion, dirty->x, dirty->y);
  41         RegionIntersect(&pixregion, &pixregion, DamageRegion(dirty->damage));
  42         RegionTranslate(&pixregion, -dirty->x, -dirty->y);
  43         was_blocked = RegionNil(&pixregion);
  44 -       DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
  45 +       DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion);
  46         RegionUninit(&pixregion);
  47         if (was_blocked)
  48                 return;
  49
  50 -       PixmapRegionInit(&pixregion, dirty->slave_dst->master_pixmap);
  51 +       PixmapRegionInit(&pixregion, dirty->secondary_dst->primary_pixmap);
  52         PixmapSyncDirtyHelper(dirty, &pixregion);
  53         RegionUninit(&pixregion);
  54
  55          intel_flush(intel);
  56         if (!intel->has_prime_vmap_flush) {
  57 -               drm_intel_bo *bo = intel_uxa_get_pixmap_bo(dirty->slave_dst->master_pixmap);
  58 +               drm_intel_bo *bo = intel_uxa_get_pixmap_bo(dirty->secondary_dst->primary_pixmap);
  59                 was_blocked = xf86BlockSIGIO();
  60                 drm_intel_bo_map(bo, FALSE);
  61                 drm_intel_bo_unmap(bo);
  62                 xf86UnblockSIGIO(was_blocked);
  63         }
  64
  65 -       DamageRegionProcessPending(&dirty->slave_dst->drawable);
  66 +       DamageRegionProcessPending(&dirty->secondary_dst->drawable);
  67         return;
  68  }
  69