sna/gen4+: Share a few common routines

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

1 files changed, 4 insertions, 27 deletions

diff --git a/src/sna/gen6_common.c b/src/sna/gen6_common.c
index f4f02645..38af859a 100644
--- a/src/sna/gen6_common.c
+++ b/src/sna/gen6_common.c
@@ -32,14 +32,6 @@
 #include "gen6_common.h"
 #include "gen4_vertex.h"
 
-void gen6_render_flush(struct sna *sna)
-{
-	gen4_vertex_close(sna);
-
-	assert(sna->render.vb_id == 0);
-	assert(sna->render.vertex_offset == 0);
-}
-
 void
 gen6_render_context_switch(struct kgem *kgem,
 			   int new_mode)
@@ -61,8 +53,7 @@ gen6_render_context_switch(struct kgem *kgem,
 	kgem->ring = new_mode;
 }
 
-void
-gen6_render_retire(struct kgem *kgem)
+void gen6_render_retire(struct kgem *kgem)
 {
 	struct sna *sna;
 
@@ -70,26 +61,12 @@ gen6_render_retire(struct kgem *kgem)
 		kgem->ring = kgem->mode;
 
 	sna = container_of(kgem, struct sna, kgem);
-	if (kgem->nbatch == 0 && sna->render.vbo && !kgem_bo_is_busy(sna->render.vbo)) {
+	if (sna->render.nvertex_reloc == 0 &&
+	    sna->render.vbo &&
+	    !kgem_bo_is_busy(sna->render.vbo)) {
 		DBG(("%s: resetting idle vbo\n", __FUNCTION__));
 		sna->render.vertex_used = 0;
 		sna->render.vertex_index = 0;
 	}
 }
 
-void
-gen6_render_expire(struct kgem *kgem)
-{
-	struct sna *sna;
-
-	sna = container_of(kgem, struct sna, kgem);
-	if (sna->render.vbo && !sna->render.vertex_used) {
-		DBG(("%s: discarding vbo\n", __FUNCTION__));
-		kgem_bo_destroy(kgem, sna->render.vbo);
-		sna->render.vbo = NULL;
-		sna->render.vertices = sna->render.vertex_data;
-		sna->render.vertex_size = ARRAY_SIZE(sna->render.vertex_data);
-		sna->render.vertex_used = 0;
-		sna->render.vertex_index = 0;
-	}
-}