sna: Remove the move-to-gpu shortcircuiting for partial GPU, no CPU damage
authorChris Wilson <chris@chris-wilson.co.uk>
Tue, 22 Oct 2013 13:22:14 +0000 (14:22 +0100)
committerChris Wilson <chris@chris-wilson.co.uk>
Thu, 24 Oct 2013 06:30:22 +0000 (07:30 +0100)
Otherwise we may not correctly undo COW or pending move-to-gpu updates.

v2: goto move_to_gpu instead for correcting the damage handling.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70821
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
src/sna/sna_accel.c

index 4edfc13..a1de360 100644 (file)
@@ -3419,8 +3419,7 @@ create_gpu_bo:
                        } else {
                                DBG(("%s: partial GPU damage with no CPU damage, continuing to use GPU\n",
                                     __FUNCTION__));
-                               priv->cpu = false;
-                               goto done;
+                               goto move_to_gpu;
                        }
                }