xf86-video-intel: src/sna/sna_accel.c

[Chris Wilson]

 src/sna/sna_accel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aff14a23f98b1230a9053a1b8434f5cc9f766d14
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Apr 12 09:49:47 2013 +0100

    sna: Refine assertion about the existence of CPU damage when GPU damaged
    
    One particular buffer type is quite cunning and simultaneously sets both
    CPU/GPU as all damaged (the upload buffer) so be aware when making bold
    assertions.
    
    Reported-by: Jiri Slaby <jirislaby at gmail.com>
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 6aef041..c363a3c 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1623,6 +1623,7 @@ skip_inplace_map:
 
 	if (DAMAGE_IS_ALL(priv->cpu_damage)) {
 		DBG(("%s: CPU all-damaged\n", __FUNCTION__));
+		assert(priv->gpu_damage == NULL || DAMAGE_IS_ALL(priv->gpu_damage));
 		goto done;
 	}
 
@@ -1792,7 +1793,6 @@ mark_damage:
 	}
 
 done:
-	assert(priv->gpu_damage == NULL);
 	if (flags & MOVE_WRITE) {
 		assert(DAMAGE_IS_ALL(priv->cpu_damage));
 		priv->source_count = SOURCE_BIAS;