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

[Chris Wilson]

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

New commits:
commit c94e653e2e150b74342da566197894b07fc6d4d4
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Nov 11 09:04:57 2015 +0000

    sna: Clear the whole tilingv2 struct
    
    The kernel doesn't clear the whole output struct when passed a larger
    than expect struct, so we have to do so ourselves.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index ac4da4b..bc790c0 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -1607,7 +1607,7 @@ static void kgem_init_swizzling(struct kgem *kgem)
 	} tiling;
 #define LOCAL_IOCTL_I915_GEM_GET_TILING DRM_IOWR (DRM_COMMAND_BASE + DRM_I915_GEM_GET_TILING, struct local_i915_gem_get_tiling_v2)
 
-	VG_CLEAR(tiling);
+	memset(&tiling, 0, sizeof(tiling));
 	tiling.handle = gem_create(kgem->fd, 1);
 	if (!tiling.handle)
 		return;
@@ -1625,7 +1625,7 @@ static void kgem_init_swizzling(struct kgem *kgem)
 		!DBG_NO_TILING &&
 		tiling.swizzle_mode != I915_BIT_6_SWIZZLE_UNKNOWN;
 
-	if (kgem->gen < 50 && tiling.phys_swizzle_mode != tiling.swizzle_mode)
+	if (kgem->gen < 050 && tiling.phys_swizzle_mode != tiling.swizzle_mode)
 		goto out;
 
 	if (!DBG_NO_DETILING)