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>
This commit is contained in:
parent
1c282afb21
commit
bccbbf8a68
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue