xf86-video-intel: src/sna/gen2_render.c src/sna/sna_render_inline.h

[Chris Wilson]

 src/sna/gen2_render.c       |    1 +
 src/sna/sna_render_inline.h |    2 ++
 2 files changed, 3 insertions(+)

New commits:
commit d2a26adc8e7b02aea204101f207f740bbde62414
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Oct 7 08:59:32 2012 +0100

    sna/gen2: Add a couple of assertions to track down a batch overflow
    
    References: https://bugs.freedesktop.org/show_bug.cgi?id=55700
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/gen2_render.c b/src/sna/gen2_render.c
index 6085348..baf8c3e 100644
--- a/src/sna/gen2_render.c
+++ b/src/sna/gen2_render.c
@@ -980,6 +980,7 @@ static void gen2_magic_ca_pass(struct sna *sna,
 	dst = sna->kgem.batch + sna->kgem.nbatch;
 	n = 1 + sna->render.vertex_index;
 	sna->kgem.nbatch += n;
+	assert(sna->kgem.nbatch <= KGEM_BATCH_SIZE(kgem));
 	while (n--)
 		*dst++ = *src++;
 }
diff --git a/src/sna/sna_render_inline.h b/src/sna/sna_render_inline.h
index 216937a..4c54317 100644
--- a/src/sna/sna_render_inline.h
+++ b/src/sna/sna_render_inline.h
@@ -47,6 +47,8 @@ static inline float pack_2s(int16_t x, int16_t y)
 
 static inline int batch_space(struct sna *sna)
 {
+	assert(sna->kgem.nbatch <= KGEM_BATCH_SIZE(kgem));
+	assert(sna->kgem.nbatch + KGEM_BATCH_RESERVED < sna->kgem.surface);
 	return sna->kgem.surface - sna->kgem.nbatch - KGEM_BATCH_RESERVED;
 }