summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2011-06-20 15:22:00 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2011-06-20 15:22:00 +0100
commit84bd6e51199bf8b49e6f6e0c29a1d71c89f6996f (patch)
tree4a314daf38263475d6c2ec52db3aa416e6cdfcc6
parent22255335e428cb1f349fe4198d36e0ab3fe06948 (diff)
sna/gen4: Correct the number of dwods required to emit the ca pass
We need 7 for pipelined pointers, 6 for the primitive and 1 for the flush. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/gen4_render.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
index da2bb764..0412f813 100644
--- a/src/sna/gen4_render.c
+++ b/src/sna/gen4_render.c
@@ -1047,7 +1047,7 @@ static bool gen4_rectangle_begin(struct sna *sna,
ndwords = 0;
if (FLUSH_EVERY_VERTEX)
- ndwords = 1;
+ ndwords += 1;
if ((sna->render_state.gen4.vb_id & (1 << id)) == 0)
ndwords += 5;
if (sna->render_state.gen4.vertex_offset == 0)
@@ -1056,7 +1056,8 @@ static bool gen4_rectangle_begin(struct sna *sna,
return true;
if (op->need_magic_ca_pass)
- ndwords += 12; /* pipelined pointers + primitive + flush */
+ /* 7xpipelined pointers + 6xprimitive + 1xflush */
+ ndwords += 14;
if (!kgem_check_batch(&sna->kgem, ndwords))
return false;