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

[Chris Wilson]

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

New commits:
commit 9a6c77d7ad9f605cd5af7656c425a1f63104f38f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun May 31 12:10:32 2015 +0100

    sna: Add a few more asserts for clearing tiling
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index b39bc15..ef1c12d 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -4363,6 +4363,8 @@ retry_large:
 						    I915_TILING_NONE, 0))
 					goto discard;
 			}
+			assert(bo->tiling == I915_TILING_NONE);
+			assert(bo->pitch == 0);
 
 			if (bo->purged && !kgem_bo_clear_purgeable(kgem, bo))
 				goto discard;
@@ -4451,6 +4453,8 @@ discard:
 			assert(list_is_empty(&bo->vma));
 			assert(list_is_empty(&bo->list));
 
+			assert(bo->tiling == I915_TILING_NONE);
+			assert(bo->pitch == 0);
 			bo->delta = 0;
 			DBG(("  %s: found handle=%d (num_pages=%d) in linear vma cache\n",
 			     __FUNCTION__, bo->handle, num_pages(bo)));
@@ -4499,6 +4503,8 @@ discard:
 			if (!kgem_set_tiling(kgem, bo, I915_TILING_NONE, 0))
 				continue;
 		}
+		assert(bo->tiling == I915_TILING_NONE);
+		assert(bo->pitch == 0);
 
 		if (bo->map__gtt || bo->map__wc || bo->map__cpu) {
 			if (flags & (CREATE_CPU_MAP | CREATE_GTT_MAP)) {