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

[Chris Wilson]

 src/sna/sna_accel.c |    3 +++
 src/sna/sna_dri.c   |    1 +
 2 files changed, 4 insertions(+)

New commits:
commit a03aba6f7f55577e29c6a3267528e2614016222d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Mon Feb 18 16:12:14 2013 +0000

    sna: A couple more assertions that we forcibly attach pixmaps correctly
    
    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 12f078e..b5e41ee 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -3041,6 +3041,9 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
 		sna_damage_all(&priv->cpu_damage,
 			       pixmap->drawable.width,
 			       pixmap->drawable.height);
+
+		assert(priv->gpu_bo == NULL);
+		assert(priv->gpu_damage == NULL);
 	}
 
 	assert(priv->gpu_damage == NULL || priv->gpu_bo);
diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index 5d5ea17..22b12f0 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -177,6 +177,7 @@ static struct kgem_bo *sna_pixmap_set_dri(struct sna *sna,
 
 	assert(priv->flush == false);
 	assert(priv->cpu_damage == NULL);
+	assert(priv->gpu_bo);
 	assert(priv->gpu_bo->proxy == NULL);
 	assert(priv->gpu_bo->flush == false);