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

[Chris Wilson]

 src/sna/sna_accel.c |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 519d0007d4add23b14b5a9fd83cf4a1b68c63d03
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jul 10 18:24:36 2013 +0100

    sna: Remove incorrect asserts for checking CPU mappings (after remapping)
    
    These assertions were checking that the previous state prior to
    performing the new mapping was consistent. Given that the checks were
    occurring after the update in mapping, the asserts were bogus.
    
    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 f99df54..dc8e4dd 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -2319,7 +2319,6 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
 							      pixmap->drawable.height)) {
 						DBG(("%s: replaced entire pixmap, destroying CPU shadow\n",
 						     __FUNCTION__));
-						assert(priv->cpu == false || (priv->mapped && IS_CPU_MAP(priv->gpu_bo->map)));
 						sna_damage_destroy(&priv->cpu_damage);
 						list_del(&priv->flush_list);
 					} else
@@ -2383,7 +2382,6 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
 							      pixmap->drawable.height)) {
 						DBG(("%s: replaced entire pixmap, destroying CPU shadow\n",
 						     __FUNCTION__));
-						assert(priv->cpu == false || (priv->mapped && IS_CPU_MAP(priv->gpu_bo->map)));
 						sna_damage_destroy(&priv->cpu_damage);
 						list_del(&priv->flush_list);
 					} else