xf86-video-intel: 2 commits - src/sna/sna_accel.c src/sna/sna_dri3.c

[Chris Wilson]

 src/sna/sna_accel.c |    1 +
 src/sna/sna_dri3.c  |    5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 13e20c7f61d8b21b33c02d8b737cf9c06bf50f17
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jul 22 08:52:10 2014 +0100

    sna: Assert that we do not overwrite an earlier COW entry
    
    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 97bcdcf..dd37396 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1979,6 +1979,7 @@ sna_pixmap_make_cow(struct sna *sna,
 
 	assert(dst_priv->move_to_gpu == NULL);
 	assert(!dst_priv->flush);
+	assert(list_is_empty(&dst_priv->cow_list));
 
 	cow = COW(src_priv->cow);
 	if (cow == NULL) {
commit d8b0a8fa033848543e0b39566b531fdfdd078087
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jul 22 08:48:58 2014 +0100

    sna/dri3: Don't forget to add SHM pixmaps to the list of exported DRI3 bo
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_dri3.c b/src/sna/sna_dri3.c
index 5d51b41..cd4c174 100644
--- a/src/sna/sna_dri3.c
+++ b/src/sna/sna_dri3.c
@@ -333,10 +333,9 @@ static int sna_dri3_fd_from_pixmap(ScreenPtr screen,
 		return -1;
 	}
 
-	if (bo == priv->gpu_bo && (priv->pinned & PIN_DRI3) == 0) {
-		list_add(&priv->cow_list, &sna->dri3.pixmaps);
+	if (bo == priv->gpu_bo)
 		priv->pinned |= PIN_DRI3;
-	}
+	list_move(&priv->cow_list, &sna->dri3.pixmaps);
 
 	*stride = (priv->pinned & PIN_DRI3) ? priv->gpu_bo->pitch : priv->cpu_bo->pitch;
 	*size = kgem_bo_size((priv->pinned & PIN_DRI3) ? priv->gpu_bo : priv->cpu_bo);