diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2013-10-22 14:22:14 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2013-10-22 17:57:58 +0100 |
| commit | bccbbf8a68faf7aac274efd289d4916083b1a1e3 (patch) | |
| tree | 2ce1fbe0df865e7fdb4b77fb99daa8bbdc3a8b54 /src | |
| parent | 1c282afb212d1d387d318256f4627385d12e1921 (diff) | |
sna: Remove the move-to-gpu shortcircuiting for partial GPU, no CPU damage
Otherwise we may not correctly undo COW or pending move-to-gpu updates.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sna/sna_accel.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index fc99a7d2..954d2345 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -3402,21 +3402,8 @@ create_gpu_bo: if (priv->gpu_damage) { assert(priv->gpu_bo); - if (!priv->cpu_damage) { - if (sna_damage_contains_box__no_reduce(priv->gpu_damage, - ®ion.extents)) { - DBG(("%s: region wholly contained within GPU damage\n", - __FUNCTION__)); - assert(sna_damage_contains_box(priv->gpu_damage, ®ion.extents) == PIXMAN_REGION_IN); - assert(sna_damage_contains_box(priv->cpu_damage, ®ion.extents) == PIXMAN_REGION_OUT); - goto use_gpu_bo; - } else { - DBG(("%s: partial GPU damage with no CPU damage, continuing to use GPU\n", - __FUNCTION__)); - priv->cpu = false; - goto done; - } - } + if (!priv->cpu_damage) + goto use_gpu_bo; ret = sna_damage_contains_box(priv->gpu_damage, ®ion.extents); if (ret == PIXMAN_REGION_IN) { |