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

[Chris Wilson]

 src/sna/sna_accel.c  |    4 +++-
 src/sna/sna_render.c |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit c79a189b6f06a58ddbd92427b6c57a0bdfb1e16c
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Mar 12 15:57:17 2013 +0000

    sna: Missing git-add for 09862a85eba243b
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_render.c b/src/sna/sna_render.c
index a929750..6a2438f 100644
--- a/src/sna/sna_render.c
+++ b/src/sna/sna_render.c
@@ -1970,7 +1970,7 @@ sna_render_composite_redirect(struct sna *sna,
 			}
 
 			assert(op->dst.bo != t->real_bo);
-			op->dst.bo->unique_id = kgem_unique_id(&sna->kgem);
+			op->dst.bo->unique_id = kgem_get_unique_id(&sna->kgem);
 			op->dst.bo->pitch = t->real_bo->pitch;
 
 			op->dst.x -= box.x1;
commit a31831bce86745205369faaa297064770f4350f9
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Mar 12 15:26:28 2013 +0000

    sna: Improve asserts that the CPU bo is not busy after synchronisation
    
    Taking into account that we may not do a full synchronisation.
    
    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 ce63338..ead4692 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1691,6 +1691,7 @@ skip_inplace_map:
 			assert(IS_CPU_MAP(priv->gpu_bo->map));
 			kgem_bo_sync__cpu_full(&sna->kgem, priv->gpu_bo,
 					       FORCE_FULL_SYNC || flags & MOVE_WRITE);
+			assert((flags & MOVE_WRITE) == 0 || !kgem_bo_is_busy(priv->gpu_bo));
 			assert_pixmap_damage(pixmap);
 			DBG(("%s: operate inplace (CPU)\n", __FUNCTION__));
 			return true;
@@ -1801,7 +1802,7 @@ done:
 			assert(IS_CPU_MAP(priv->cpu_bo->map));
 			kgem_bo_sync__cpu_full(&sna->kgem, priv->cpu_bo,
 					       FORCE_FULL_SYNC || flags & MOVE_WRITE);
-			assert(!priv->shm || !kgem_bo_is_busy(priv->cpu_bo));
+			assert((flags & MOVE_WRITE) == 0 || !kgem_bo_is_busy(priv->cpu_bo));
 		}
 		if (flags & MOVE_WRITE) {
 			DBG(("%s: discarding GPU bo in favour of CPU bo\n", __FUNCTION__));
@@ -2333,6 +2334,7 @@ out:
 		assert(IS_CPU_MAP(priv->cpu_bo->map));
 		kgem_bo_sync__cpu_full(&sna->kgem, priv->cpu_bo,
 				       FORCE_FULL_SYNC || flags & MOVE_WRITE);
+		assert((flags & MOVE_WRITE) == 0 || !kgem_bo_is_busy(priv->cpu_bo));
 	}
 	priv->cpu = (flags & MOVE_ASYNC_HINT) == 0;
 	assert(pixmap->devPrivate.ptr);