From 6054f8e1120d499f70e7bd4809b3fc6994792bcb Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 4 Oct 2012 14:40:59 +0100 Subject: [PATCH] sna: Remove another sna_pixmap->cpu assertion that was not true Signed-off-by: Chris Wilson --- src/sna/sna_accel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index d849bea6..306302ec 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -2722,7 +2722,6 @@ create_gpu_bo: if (priv->gpu_damage) { if (!priv->cpu_damage) { - assert(priv->cpu == false); if (sna_damage_contains_box__no_reduce(priv->gpu_damage, ®ion.extents)) { DBG(("%s: region wholly contained within GPU damage\n", @@ -2731,6 +2730,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; } }