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

[Chris Wilson]

 src/sna/sna_accel.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 86efddd9e4b921fcfc1a4b7492ba9174b84de64c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Apr 8 10:54:56 2013 +0100

    sna: Remove assertions for mapped GPU bo if priv->cpu after GPU bo creation
    
    The condition that we have a mapped GPU bo iff priv->cpu is only true if
    we have a GPU bo at the time of using the CPU -- if we create the GPU bo
    during move_to_gpu, then that assertion is bogus.
    
    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 217a4a2..6aef041 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2893,7 +2893,6 @@ done:
 	if (sna_damage_is_all(&priv->gpu_damage,
 			      pixmap->drawable.width,
 			      pixmap->drawable.height)) {
-		assert(priv->cpu == false || (priv->mapped && IS_CPU_MAP(priv->gpu_bo->map)));
 		sna_damage_destroy(&priv->cpu_damage);
 		list_del(&priv->list);
 		*damage = NULL;
@@ -3295,10 +3294,8 @@ done:
 	sna_damage_reduce_all(&priv->gpu_damage,
 			      pixmap->drawable.width,
 			      pixmap->drawable.height);
-	if (DAMAGE_IS_ALL(priv->gpu_damage)) {
-		assert(priv->cpu == false || (priv->mapped && IS_CPU_MAP(priv->gpu_bo->map)));
+	if (DAMAGE_IS_ALL(priv->gpu_damage))
 		sna_pixmap_free_cpu(sna, priv);
-	}
 
 active:
 	if (flags & MOVE_WRITE)