summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2013-12-15 10:41:22 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2013-12-15 10:42:35 +0000
commit660fbdac8da1f43749007f126201681023a677e1 (patch)
tree40bb217a31e211f1eb1616ba30133cb48952ef5a
parent989198f3ddc763000702bd1eaeb54002e18a8f04 (diff)
sna: Remove stale assertion
Now that we do not remove the move-to-gpu for a plain read from the TearFree buffer, it is viable to use that buffer as source for cloning. So we need to kill the stale assertion. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_accel.c1
-rw-r--r--src/sna/sna_display.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 5df49b3e..f1be82a2 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1762,7 +1762,6 @@ sna_pixmap_make_cow(struct sna *sna,
struct sna_cow *cow;
assert(src_priv->gpu_bo);
- assert(src_priv->move_to_gpu == NULL);
if (!USE_COW)
return false;
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 15e32dff..5810dd1b 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -4357,6 +4357,7 @@ static bool wait_for_shadow(struct sna *sna, struct sna_pixmap *priv, unsigned f
return true;
assert(sna->mode.shadow_active);
+ assert(bo == sna->mode.shadow);
assert(priv->gpu_bo->refcnt >= 1);
sna->mode.shadow = priv->gpu_bo;