Module: Mesa
Branch: master
Commit: 1387e722cde7c33ad07766eb715bc74e84a43e80
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=1387e722cde7c33ad07766eb715bc74e84a43e80
Author: Eric Anholt <e...@anholt.net>
Date: Mon May 2 14:45:45 2016 -0700
vc4: Make sure that we don't overwrite the signal for PROG_END.
We should have already emitted a NOP due to the last instruction being a
TLB or VPM write. However, if you disable dead code elimination then you
might get dead code at the end, and that dead code might have the signal
bits set to something non-default, at which point you die in assertion
failure.
---
src/gallium/drivers/vc4/vc4_qpu_emit.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/src/gallium/drivers/vc4/vc4_qpu_emit.c
b/src/gallium/drivers/vc4/vc4_qpu_emit.c
index 11640fa..ecb7094 100644
--- a/src/gallium/drivers/vc4/vc4_qpu_emit.c
+++ b/src/gallium/drivers/vc4/vc4_qpu_emit.c
@@ -510,6 +510,14 @@ vc4_generate_code(struct vc4_context *vc4, struct
vc4_compile *c)
if (qpu_inst_is_tlb(c->qpu_insts[c->qpu_inst_count - 1]))
qpu_serialize_one_inst(c, qpu_NOP());
+ /* Make sure there's no existing signal set (like for a small
+ * immediate)
+ */
+ if (QPU_GET_FIELD(c->qpu_insts[c->qpu_inst_count - 1],
+ QPU_SIG) != QPU_SIG_NONE) {
+ qpu_serialize_one_inst(c, qpu_NOP());
+ }
+
c->qpu_insts[c->qpu_inst_count - 1] =
qpu_set_sig(c->qpu_insts[c->qpu_inst_count - 1],
QPU_SIG_PROG_END);
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
