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

[Chris Wilson]

 src/sna/kgem.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b0aa9d349ddf727dc544bc46d066f990d3e42776
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jun 2 11:57:18 2015 +0100

    sna: Reorder can-fence test to account for bit17 swizzling
    
    References: https://bugs.freedesktop.org/show_bug.cgi?id=90725#c40
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index 004f04d..de604b0 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1603,13 +1603,13 @@ 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;
+
 	if (kgem->gen < 50 && tiling.phys_swizzle_mode != tiling.swizzle_mode)
 		goto out;
 
 	if (!DBG_NO_DETILING)
 		choose_memcpy_tiled_x(kgem, tiling.swizzle_mode);
-
-	kgem->can_fence = tiling.swizzle_mode != I915_BIT_6_SWIZZLE_UNKNOWN;
 out:
 	gem_close(kgem->fd, tiling.handle);
 	DBG(("%s: can fence?=%d\n", __FUNCTION__, kgem->can_fence));