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

[Chris Wilson]

 src/sna/sna_accel.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit bc5f81901f1b4451e4187b97f65a8be4c03b2494
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Mar 5 15:53:24 2013 +0000

    sna: The GPU bo submit is still required before mapping for inplace operations
    
    As we may choose to force the stall as we would be doing a read-back in
    any event...
    
    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 76ec3b8..e12cb07 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -1614,6 +1614,8 @@ skip_inplace_map:
 	     sna_pixmap_create_mappable_gpu(pixmap, (flags & MOVE_READ) == 0)) {
 		DBG(("%s: try to operate inplace (GTT)\n", __FUNCTION__));
 		assert((flags & MOVE_READ) == 0 || priv->cpu == false);
+		/* XXX only sync for writes? */
+		kgem_bo_submit(&sna->kgem, priv->gpu_bo);
 		assert(priv->gpu_bo->exec == NULL);
 
 		pixmap->devPrivate.ptr = kgem_bo_map(&sna->kgem, priv->gpu_bo);
@@ -1971,6 +1973,8 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
 	    region_inplace(sna, pixmap, region, priv, (flags & MOVE_READ) == 0) &&
 	     sna_pixmap_create_mappable_gpu(pixmap, false)) {
 		DBG(("%s: try to operate inplace\n", __FUNCTION__));
+		/* XXX only sync for writes? */
+		kgem_bo_submit(&sna->kgem, priv->gpu_bo);
 		assert(priv->gpu_bo->exec == NULL);
 
 		pixmap->devPrivate.ptr = kgem_bo_map(&sna->kgem, priv->gpu_bo);
commit 43e3886c6de3ab89e3629c98287ede77ae2f6876
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Mar 5 15:32:35 2013 +0000

    sna: Use drawable_gc_flags() to select placement for PolyArc
    
    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 700eaa8..76ec3b8 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -9295,7 +9295,7 @@ fallback:
 	if (!sna_gc_move_to_cpu(gc, drawable, &data.region))
 		goto out;
 	if (!sna_drawable_move_region_to_cpu(drawable, &data.region,
-					     MOVE_READ | MOVE_WRITE))
+					     drawable_gc_flags(drawable, gc, true)))
 		goto out_gc;
 
 	DBG(("%s -- fbPolyArc\n", __FUNCTION__));