From 660fbdac8da1f43749007f126201681023a677e1 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 15 Dec 2013 10:41:22 +0000 Subject: [PATCH] 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 --- src/sna/sna_accel.c | 1 - src/sna/sna_display.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index 5df49b3..f1be82a 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 15e32df..5810dd1 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; -- 2.7.4