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

[Chris Wilson]

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

New commits:
commit 4cc2fb8fbfa09699abfa10d563b28fdac197af99
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jul 24 11:39:53 2015 +0100

    sna: Add logging for set-tiling failure
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 355ad05..24c8210 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -481,6 +481,8 @@ restart:
 		goto restart;
 	}
 
+	ERR(("%s: failed to set-tiling(tiling=%d, pitch=%d) for handle=%d: %d\n",
+	     __FUNCTION__, tiling, stride, bo->handle, err));
 	return false;
 }
 
commit f252dba9da4faaeb6b6822090adc867a707d517d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Jul 24 11:34:25 2015 +0100

    sna: Use DBG_NO_TILING to disable all fencing
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index fc269b2..355ad05 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1603,7 +1603,10 @@ static void kgem_init_swizzling(struct kgem *kgem)
 
 	DBG(("%s: swizzle_mode=%d, phys_swizzle_mode=%d\n",
 	     __FUNCTION__, tiling.swizzle_mode, tiling.phys_swizzle_mode));
-	kgem->can_fence = tiling.swizzle_mode != I915_BIT_6_SWIZZLE_UNKNOWN;
+
+	kgem->can_fence =
+		!DBG_NO_TILING &&
+		tiling.swizzle_mode != I915_BIT_6_SWIZZLE_UNKNOWN;
 
 	if (kgem->gen < 50 && tiling.phys_swizzle_mode != tiling.swizzle_mode)
 		goto out;