From 43336c632beb5d599ec0fc614434b88ef7a26422 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Sat, 29 Dec 2012 16:47:53 +0000
Subject: [PATCH] sna: Seed the solid color cache with an invalid value to
 prevent false hits

After flushing, we *do* need to make sure we cannot hit a false lookup
via the last cache.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/sna_gradient.c | 22 ++++++++++++++--------
 src/sna/sna_render.h   |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/sna/sna_gradient.c b/src/sna/sna_gradient.c
index c437b274..db09e72d 100644
--- a/src/sna/sna_gradient.c
+++ b/src/sna/sna_gradient.c
@@ -219,11 +219,11 @@ sna_render_flush_solid(struct sna *sna)
 	DBG(("sna_render_flush_solid(size=%d)\n", cache->size));
 	assert(cache->dirty);
 	assert(cache->size);
+	assert(cache->size <= 1024);
 
 	kgem_bo_write(&sna->kgem, cache->cache_bo,
 		      cache->color, cache->size*sizeof(uint32_t));
 	cache->dirty = 0;
-	cache->last = 0;
 }
 
 static void
@@ -250,10 +250,8 @@ sna_render_finish_solid(struct sna *sna, bool force)
 		cache->bo[i] = NULL;
 	}
 
-	old = cache->cache_bo;
-
 	DBG(("sna_render_finish_solid reset\n"));
-
+	old = cache->cache_bo;
 	cache->cache_bo = kgem_create_linear(&sna->kgem, sizeof(cache->color), 0);
 	if (cache->cache_bo == NULL) {
 		cache->cache_bo = old;
@@ -262,6 +260,14 @@ sna_render_finish_solid(struct sna *sna, bool force)
 
 	if (force)
 		cache->size = 0;
+	if (cache->last < cache->size) {
+		cache->bo[cache->last] = kgem_create_proxy(&sna->kgem, cache->cache_bo,
+							   cache->last*sizeof(uint32_t), sizeof(uint32_t));
+		if (cache->bo[cache->last])
+			cache->bo[cache->last]->pitch = 4;
+		else
+			cache->last = 1024;
+	}
 
 	if (old)
 		kgem_bo_destroy(&sna->kgem, old);
@@ -334,7 +340,7 @@ sna_render_get_solid(struct sna *sna, uint32_t color)
 		}
 	}
 
-	sna_render_finish_solid(sna, i == ARRAY_SIZE(cache->color));
+	sna_render_finish_solid(sna, i == 1024);
 
 	i = cache->size++;
 	cache->color[i] = color;
@@ -406,14 +412,14 @@ static bool sna_solid_cache_init(struct sna *sna)
 	DBG(("%s\n", __FUNCTION__));
 
 	cache->cache_bo =
-		kgem_create_linear(&sna->kgem, sizeof(cache->color), 0);
+		kgem_create_linear(&sna->kgem, 4096, 0);
 	if (!cache->cache_bo)
 		return false;
 
-	cache->color[0] = 0;
+	cache->last = 1024;
+	cache->color[cache->last] = 0;
 	cache->dirty = 0;
 	cache->size = 0;
-	cache->last = 0;
 
 	return true;
 }
diff --git a/src/sna/sna_render.h b/src/sna/sna_render.h
index 2f444790..b957a9f5 100644
--- a/src/sna/sna_render.h
+++ b/src/sna/sna_render.h
@@ -259,8 +259,8 @@ struct sna_render {
 
 	struct sna_solid_cache {
 		struct kgem_bo *cache_bo;
-		uint32_t color[1024];
 		struct kgem_bo *bo[1024];
+		uint32_t color[1025];
 		int last;
 		int size;
 		int dirty;