From ed8c729ed02705fd03be1ab22a94b5aae13567c8 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 17 Jul 2012 11:21:30 +0100 Subject: [PATCH] sna: Catch the short-circuit path for clearing clear on move-to-gpu as well I thought the short-circuit path was only taken when already clear, I was wrong. Signed-off-by: Chris Wilson --- src/sna/sna_accel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c index c4b6abae..ebf7a236 100644 --- a/src/sna/sna_accel.c +++ b/src/sna/sna_accel.c @@ -2766,9 +2766,10 @@ done: sna_pixmap_free_cpu(sna, priv); } } + +active: if (flags & MOVE_WRITE) priv->clear = false; -active: assert(!priv->gpu_bo->proxy || (flags & MOVE_WRITE) == 0); return sna_pixmap_mark_active(sna, priv); }