summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/sna/gen2_render.c7
-rw-r--r--src/sna/gen3_render.c7
-rw-r--r--src/sna/gen4_render.c7
-rw-r--r--src/sna/gen5_render.c7
-rw-r--r--src/sna/gen6_render.c7
-rw-r--r--src/sna/gen7_render.c7
-rw-r--r--src/sna/gen8_render.c7
-rw-r--r--src/sna/sna.h2
-rw-r--r--src/sna/sna_accel.c36
-rw-r--r--src/sna/sna_blt.c6
-rw-r--r--src/sna/sna_composite.c2
11 files changed, 65 insertions, 30 deletions
diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index f51d6cf3..fc0406e2 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -1621,7 +1621,7 @@ gen2_composite_set_target(struct sna *sna,
hint = PREFER_GPU | FORCE_GPU | RENDER_GPU;
if (!partial) {
- hint |= IGNORE_CPU;
+ hint |= IGNORE_DAMAGE;
if (w == op->dst.width && h == op->dst.height)
hint |= REPLACES;
}
@@ -1630,6 +1630,11 @@ gen2_composite_set_target(struct sna *sna,
if (op->dst.bo == NULL)
return false;
+ if (hint & REPLACES) {
+ struct sna_pixmap *priv = sna_pixmap(op->dst.pixmap);
+ kgem_bo_pair_undo(&sna->kgem, priv->gpu_bo, priv->cpu_bo);
+ }
+
assert((op->dst.bo->pitch & 7) == 0);
get_drawable_deltas(dst->pDrawable, op->dst.pixmap,
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index a1b37b60..7616a918 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -3184,7 +3184,7 @@ gen3_composite_set_target(struct sna *sna,
hint = PREFER_GPU | FORCE_GPU | RENDER_GPU;
if (!partial) {
- hint |= IGNORE_CPU;
+ hint |= IGNORE_DAMAGE;
if (w == op->dst.width && h == op->dst.height)
hint |= REPLACES;
}
@@ -3193,6 +3193,11 @@ gen3_composite_set_target(struct sna *sna,
if (op->dst.bo == NULL)
return false;
+ if (hint & REPLACES) {
+ struct sna_pixmap *priv = sna_pixmap(op->dst.pixmap);
+ kgem_bo_pair_undo(&sna->kgem, priv->gpu_bo, priv->cpu_bo);
+ }
+
assert(op->dst.bo->unique_id);
/* For single-stream mode there should be no minimum alignment
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index ef982efa..5340e7fc 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -1666,7 +1666,7 @@ gen4_composite_set_target(struct sna *sna,
hint = PREFER_GPU | FORCE_GPU | RENDER_GPU;
if (!partial) {
- hint |= IGNORE_CPU;
+ hint |= IGNORE_DAMAGE;
if (w == op->dst.width && h == op->dst.height)
hint |= REPLACES;
}
@@ -1675,6 +1675,11 @@ gen4_composite_set_target(struct sna *sna,
if (op->dst.bo == NULL)
return false;
+ if (hint & REPLACES) {
+ struct sna_pixmap *priv = sna_pixmap(op->dst.pixmap);
+ kgem_bo_pair_undo(&sna->kgem, priv->gpu_bo, priv->cpu_bo);
+ }
+
get_drawable_deltas(dst->pDrawable, op->dst.pixmap,
&op->dst.x, &op->dst.y);
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 449a394e..aa566635 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -1620,7 +1620,7 @@ gen5_composite_set_target(struct sna *sna,
hint = PREFER_GPU | FORCE_GPU | RENDER_GPU;
if (!partial) {
- hint |= IGNORE_CPU;
+ hint |= IGNORE_DAMAGE;
if (w == op->dst.width && h == op->dst.height)
hint |= REPLACES;
}
@@ -1629,6 +1629,11 @@ gen5_composite_set_target(struct sna *sna,
if (op->dst.bo == NULL)
return false;
+ if (hint & REPLACES) {
+ struct sna_pixmap *priv = sna_pixmap(op->dst.pixmap);
+ kgem_bo_pair_undo(&sna->kgem, priv->gpu_bo, priv->cpu_bo);
+ }
+
get_drawable_deltas(dst->pDrawable, op->dst.pixmap,
&op->dst.x, &op->dst.y);
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 82bcbe04..cc1c209b 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -1888,7 +1888,7 @@ gen6_composite_set_target(struct sna *sna,
hint = PREFER_GPU | FORCE_GPU | RENDER_GPU;
if (!partial) {
- hint |= IGNORE_CPU;
+ hint |= IGNORE_DAMAGE;
if (w == op->dst.width && h == op->dst.height)
hint |= REPLACES;
}
@@ -1897,6 +1897,11 @@ gen6_composite_set_target(struct sna *sna,
if (op->dst.bo == NULL)
return false;
+ if (hint & REPLACES) {
+ struct sna_pixmap *priv = sna_pixmap(op->dst.pixmap);
+ kgem_bo_pair_undo(&sna->kgem, priv->gpu_bo, priv->cpu_bo);
+ }
+
get_drawable_deltas(dst->pDrawable, op->dst.pixmap,
&op->dst.x, &op->dst.y);
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 9aa07133..5815490a 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -2142,7 +2142,7 @@ gen7_composite_set_target(struct sna *sna,
hint = PREFER_GPU | FORCE_GPU | RENDER_GPU;
if (!partial) {
- hint |= IGNORE_CPU;
+ hint |= IGNORE_DAMAGE;
if (w == op->dst.width && h == op->dst.height)
hint |= REPLACES;
}
@@ -2151,6 +2151,11 @@ gen7_composite_set_target(struct sna *sna,
if (op->dst.bo == NULL)
return false;
+ if (hint & REPLACES) {
+ struct sna_pixmap *priv = sna_pixmap(op->dst.pixmap);
+ kgem_bo_pair_undo(&sna->kgem, priv->gpu_bo, priv->cpu_bo);
+ }
+
get_drawable_deltas(dst->pDrawable, op->dst.pixmap,
&op->dst.x, &op->dst.y);
diff --git a/src/sna/gen8_render.c b/src/sna/gen8_render.c
index e2a4bfc1..b66a7357 100644
--- a/src/sna/gen8_render.c
+++ b/src/sna/gen8_render.c
@@ -1956,7 +1956,7 @@ gen8_composite_set_target(struct sna *sna,
hint = PREFER_GPU | FORCE_GPU | RENDER_GPU;
if (!partial) {
- hint |= IGNORE_CPU;
+ hint |= IGNORE_DAMAGE;
if (w == op->dst.width && h == op->dst.height)
hint |= REPLACES;
}
@@ -1968,6 +1968,11 @@ gen8_composite_set_target(struct sna *sna,
if (unaligned(op->dst.bo, dst->pDrawable->bitsPerPixel))
return false;
+ if (hint & REPLACES) {
+ struct sna_pixmap *priv = sna_pixmap(op->dst.pixmap);
+ kgem_bo_pair_undo(&sna->kgem, priv->gpu_bo, priv->cpu_bo);
+ }
+
get_drawable_deltas(dst->pDrawable, op->dst.pixmap,
&op->dst.x, &op->dst.y);
diff --git a/src/sna/sna.h b/src/sna/sna.h
index 1985ad84..8640f2f4 100644
--- a/src/sna/sna.h
+++ b/src/sna/sna.h
@@ -739,7 +739,7 @@ struct kgem_bo *sna_pixmap_change_tiling(PixmapPtr pixmap, uint32_t tiling);
#define PREFER_GPU 0x1
#define FORCE_GPU 0x2
#define RENDER_GPU 0x4
-#define IGNORE_CPU 0x8
+#define IGNORE_DAMAGE 0x8
#define REPLACES 0x10
struct kgem_bo *
sna_drawable_use_bo(DrawablePtr drawable, unsigned flags, const BoxRec *box,
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 78f5fed1..f481c19e 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -3449,7 +3449,7 @@ sna_drawable_use_bo(DrawablePtr drawable, unsigned flags, const BoxRec *box,
if (priv->cow) {
unsigned cow = MOVE_WRITE | MOVE_READ;
- if (flags & IGNORE_CPU) {
+ if (flags & IGNORE_DAMAGE) {
if (priv->gpu_damage) {
region.extents = *box;
if (get_drawable_deltas(drawable, pixmap, &dx, &dy)) {
@@ -3498,7 +3498,7 @@ sna_drawable_use_bo(DrawablePtr drawable, unsigned flags, const BoxRec *box,
DBG(("%s: pinned, never REPLACES\n", __FUNCTION__));
flags &= ~REPLACES;
}
- if (priv->cpu && (flags & (FORCE_GPU | IGNORE_CPU)) == 0) {
+ if (priv->cpu && (flags & (FORCE_GPU | IGNORE_DAMAGE)) == 0) {
DBG(("%s: last on cpu and needs damage, discard PREFER_GPU\n", __FUNCTION__));
flags &= ~PREFER_GPU;
}
@@ -3507,7 +3507,7 @@ sna_drawable_use_bo(DrawablePtr drawable, unsigned flags, const BoxRec *box,
flags &= ~PREFER_GPU;
}
- if ((flags & (PREFER_GPU | IGNORE_CPU)) == IGNORE_CPU) {
+ if ((flags & (PREFER_GPU | IGNORE_DAMAGE)) == IGNORE_DAMAGE) {
if (priv->gpu_bo && (box_covers_pixmap(pixmap, box) || box_inplace(pixmap, box))) {
DBG(("%s: not reading damage and large, set PREFER_GPU\n", __FUNCTION__));
flags |= PREFER_GPU;
@@ -3518,7 +3518,7 @@ sna_drawable_use_bo(DrawablePtr drawable, unsigned flags, const BoxRec *box,
__FUNCTION__, priv->flush, priv->shm, priv->cpu, flags));
if ((flags & PREFER_GPU) == 0 &&
- (flags & REPLACES || !priv->gpu_damage || !kgem_bo_is_busy(priv->gpu_bo))) {
+ (flags & (REPLACES | IGNORE_DAMAGE) || !priv->gpu_damage || !kgem_bo_is_busy(priv->gpu_bo))) {
DBG(("%s: try cpu as GPU bo is idle\n", __FUNCTION__));
goto use_cpu_bo;
}
@@ -3553,7 +3553,7 @@ sna_drawable_use_bo(DrawablePtr drawable, unsigned flags, const BoxRec *box,
goto use_cpu_bo;
}
- if ((flags & IGNORE_CPU) == 0) {
+ if ((flags & IGNORE_DAMAGE) == 0) {
if (priv->cpu_bo) {
if (to_sna_from_pixmap(pixmap)->kgem.can_blt_cpu) {
if (kgem_bo_is_busy(priv->cpu_bo)) {
@@ -3632,11 +3632,11 @@ create_gpu_bo:
if (priv->gpu_damage) {
assert(priv->gpu_bo);
- if (!priv->cpu_damage || flags & IGNORE_CPU) {
+ if (!priv->cpu_damage || flags & IGNORE_DAMAGE) {
if (flags & REPLACES || box_covers_pixmap(pixmap, &region.extents)) {
unsigned int move;
- if (flags & IGNORE_CPU)
+ if (flags & IGNORE_DAMAGE)
move = MOVE_WRITE;
else
move = MOVE_WRITE | MOVE_READ;
@@ -3674,7 +3674,7 @@ create_gpu_bo:
}
}
- if ((flags & IGNORE_CPU) == 0 && priv->cpu_damage) {
+ if ((flags & IGNORE_DAMAGE) == 0 && priv->cpu_damage) {
ret = sna_damage_contains_box(&priv->cpu_damage, &region.extents);
if (ret == PIXMAN_REGION_IN) {
DBG(("%s: region wholly contained within CPU damage\n",
@@ -3696,7 +3696,7 @@ create_gpu_bo:
move_to_gpu:
if (!sna_pixmap_move_area_to_gpu(pixmap, &region.extents,
- flags & IGNORE_CPU ? MOVE_WRITE : MOVE_READ | MOVE_WRITE)) {
+ flags & IGNORE_DAMAGE ? MOVE_WRITE : MOVE_READ | MOVE_WRITE)) {
DBG(("%s: failed to move-to-gpu, fallback\n", __FUNCTION__));
assert(priv->gpu_bo == NULL);
goto use_cpu_bo;
@@ -3730,7 +3730,7 @@ use_gpu_bo:
sna = to_sna_from_pixmap(pixmap);
- if (flags & IGNORE_CPU) {
+ if (flags & IGNORE_DAMAGE) {
region.extents = *box;
region.data = NULL;
if (get_drawable_deltas(drawable, pixmap, &dx, &dy)) {
@@ -3819,7 +3819,7 @@ cpu_fail:
if (priv->cpu_bo->pitch >= 4096)
goto move_to_gpu;
- if ((flags & IGNORE_CPU) == 0 && priv->cpu_bo->snoop)
+ if ((flags & IGNORE_DAMAGE) == 0 && priv->cpu_bo->snoop)
goto move_to_gpu;
if (!sna->kgem.can_blt_cpu)
@@ -3830,7 +3830,7 @@ cpu_fail:
goto cpu_fail;
if (!sna_drawable_move_region_to_cpu(&pixmap->drawable, &region,
- (flags & IGNORE_CPU ? 0 : MOVE_READ) | MOVE_WRITE | MOVE_ASYNC_HINT)) {
+ (flags & IGNORE_DAMAGE ? 0 : MOVE_READ) | MOVE_WRITE | MOVE_ASYNC_HINT)) {
DBG(("%s: failed to move-to-cpu, fallback\n", __FUNCTION__));
goto cpu_fail;
}
@@ -6161,15 +6161,15 @@ discard_cow:
hint = copy_prefer_gpu(sna, dst_priv, src_priv, region, src_dx, src_dy);
if (replaces) {
discard_cpu_damage(sna, dst_priv);
- hint |= REPLACES | IGNORE_CPU;
+ hint |= REPLACES | IGNORE_DAMAGE;
} else if (alu_overwrites(alu)) {
if (region->data == NULL)
- hint |= IGNORE_CPU;
+ hint |= IGNORE_DAMAGE;
if (dst_priv->cpu_damage &&
region_subsumes_damage(region,
dst_priv->cpu_damage)) {
discard_cpu_damage(sna, dst_priv);
- hint |= IGNORE_CPU;
+ hint |= IGNORE_DAMAGE;
}
}
bo = sna_drawable_use_bo(&dst_pixmap->drawable, hint,
@@ -14575,7 +14575,7 @@ sna_poly_fill_rect(DrawablePtr draw, GCPtr gc, int n, xRectangle *rect)
}
if ((flags & 2) == 0) {
- hint |= IGNORE_CPU;
+ hint |= IGNORE_DAMAGE;
if (region_subsumes_drawable(&region, &pixmap->drawable)) {
discard_cpu_damage(sna, priv);
hint |= REPLACES;
@@ -14927,7 +14927,7 @@ sna_glyph_blt(DrawablePtr drawable, GCPtr gc,
}
if (!transparent && clip->data == NULL)
- hint = PREFER_GPU | IGNORE_CPU;
+ hint = PREFER_GPU | IGNORE_DAMAGE;
else
hint = PREFER_GPU;
@@ -15982,7 +15982,7 @@ sna_image_glyph(DrawablePtr drawable, GCPtr gc,
goto fallback;
if (region.data == NULL)
- hint = IGNORE_CPU | PREFER_GPU;
+ hint = IGNORE_DAMAGE | PREFER_GPU;
else
hint = PREFER_GPU;
if ((bo = sna_drawable_use_bo(drawable, hint,
diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index f3caf612..98bd49b9 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -2524,7 +2524,7 @@ clear:
if (can_render(sna)) {
hint |= PREFER_GPU;
if ((flags & COMPOSITE_PARTIAL) == 0) {
- hint |= IGNORE_CPU;
+ hint |= IGNORE_DAMAGE;
if (width == tmp->dst.pixmap->drawable.width &&
height == tmp->dst.pixmap->drawable.height)
hint |= REPLACES;
@@ -2614,7 +2614,7 @@ fill:
if (can_render(sna)) {
hint |= PREFER_GPU;
if ((flags & COMPOSITE_PARTIAL) == 0) {
- hint |= IGNORE_CPU;
+ hint |= IGNORE_DAMAGE;
if (width == tmp->dst.pixmap->drawable.width &&
height == tmp->dst.pixmap->drawable.height)
hint |= REPLACES;
@@ -2780,7 +2780,7 @@ fill:
if (bo || can_render(sna)) {
hint |= PREFER_GPU;
if ((flags & COMPOSITE_PARTIAL) == 0) {
- hint |= IGNORE_CPU;
+ hint |= IGNORE_DAMAGE;
if (width == tmp->dst.pixmap->drawable.width &&
height == tmp->dst.pixmap->drawable.height)
hint |= REPLACES;
diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
index 5ce6b2f4..490999f8 100644
--- a/src/sna/sna_composite.c
+++ b/src/sna/sna_composite.c
@@ -967,7 +967,7 @@ sna_composite_rectangles(CARD8 op,
}
if (region.data == NULL) {
- hint |= IGNORE_CPU;
+ hint |= IGNORE_DAMAGE;
if (region_subsumes_drawable(&region, &pixmap->drawable))
hint |= REPLACES;
if (priv->cpu_damage &&
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 04:58:52 +0000