5 files changed, 5 insertions, 5 deletions
diff --git a/src/sna/gen3_render.c b/src/sna/gen3_render.c
index 6c0ea6a6..3eb29668 100644
--- a/src/sna/gen3_render.c
+++ b/src/sna/gen3_render.c
@@ -2008,7 +2008,7 @@ flush:
 		gen3_vertex_flush(sna);
 		gen3_magic_ca_pass(sna, op);
 	}
-	gen3_vertex_finish(sna);
+	sna_vertex_wait__locked(&sna->render);
 	_kgem_submit(&sna->kgem);
 	gen3_emit_composite_state(sna, op);
 	assert(sna->render.vertex_offset == 0);
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index e4f5f594..249d6261 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -667,7 +667,7 @@ flush:
 		gen4_vertex_flush(sna);
 		gen4_magic_ca_pass(sna, op);
 	}
-	gen4_vertex_finish(sna);
+	sna_vertex_wait__locked(&sna->render);
 	_kgem_submit(&sna->kgem);
 	emit_state(sna, op);
 	goto start;
diff --git a/src/sna/gen5_render.c b/src/sna/gen5_render.c
index 998d55e2..e4649c4b 100644
--- a/src/sna/gen5_render.c
+++ b/src/sna/gen5_render.c
@@ -654,7 +654,7 @@ flush:
 		gen4_vertex_flush(sna);
 		gen5_magic_ca_pass(sna, op);
 	}
-	gen4_vertex_finish(sna);
+	sna_vertex_wait__locked(&sna->render);
 	_kgem_submit(&sna->kgem);
 	emit_state(sna, op);
 	goto start;
diff --git a/src/sna/gen6_render.c b/src/sna/gen6_render.c
index 4a9387a6..bb35e10f 100644
--- a/src/sna/gen6_render.c
+++ b/src/sna/gen6_render.c
@@ -1204,7 +1204,7 @@ flush:
 		gen4_vertex_flush(sna);
 		gen6_magic_ca_pass(sna, op);
 	}
-	gen4_vertex_finish(sna);
+	sna_vertex_wait__locked(&sna->render);
 	_kgem_submit(&sna->kgem);
 	emit_state(sna, op);
 	goto start;
diff --git a/src/sna/gen7_render.c b/src/sna/gen7_render.c
index 6eec4b45..a3ec26e4 100644
--- a/src/sna/gen7_render.c
+++ b/src/sna/gen7_render.c
@@ -1329,7 +1329,7 @@ flush:
 		gen4_vertex_flush(sna);
 		gen7_magic_ca_pass(sna, op);
 	}
-	gen4_vertex_finish(sna);
+	sna_vertex_wait__locked(&sna->render);
 	_kgem_submit(&sna->kgem);
 	emit_state(sna, op);
 	goto start;