sna: Remember to offset the box before asserting damage

When using sna_copy_boxes__inplace(), we need to remember that the
region is in destination space, so we need to offset the boxes when
comparing against the source. The assertion forgot to do so, and so
failed as soon as it met a little complexity.

Reported-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

2 files changed, 15 insertions, 2 deletions

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 8a7a2490..9ddc6331 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -5109,8 +5109,8 @@ sna_copy_boxes__inplace(struct sna *sna, RegionPtr region, int alu,
 		return false;
 	}
 
-	assert(sna_damage_contains_box(src_priv->gpu_damage, &region->extents) == PIXMAN_REGION_IN);
-	assert(sna_damage_contains_box(src_priv->cpu_damage, &region->extents) == PIXMAN_REGION_OUT);
+	assert(sna_damage_contains_box(src_priv->gpu_damage, &region->extents, dx, dy) == PIXMAN_REGION_IN);
+	assert(sna_damage_contains_box(src_priv->cpu_damage, &region->extents, dx, dy) == PIXMAN_REGION_OUT);
 
 	src = kgem_bo_map__cpu(&sna->kgem, src_priv->gpu_bo);
 	if (src == NULL) {
diff --git a/src/sna/sna_damage.h b/src/sna/sna_damage.h
index 03a54a3d..187d312d 100644
--- a/src/sna/sna_damage.h
+++ b/src/sna/sna_damage.h
@@ -215,6 +215,19 @@ static inline int sna_damage_contains_box(struct sna_damage *damage,
 
 	return _sna_damage_contains_box(damage, box);
 }
+static inline int sna_damage_contains_box__offset(struct sna_damage *damage,
+						  const BoxRec *box, int dx, int dy)
+{
+	BoxRec b;
+
+	if (DAMAGE_IS_ALL(damage))
+		return PIXMAN_REGION_IN;
+
+	b = *box;
+	b.x1 += dx; b.x2 += dx;
+	b.y1 += dy; b.y2 += dy;
+	return _sna_damage_contains_box(damage, &b);
+}
 bool _sna_damage_contains_box__no_reduce(const struct sna_damage *damage,
 					const BoxRec *box);
 static inline bool