Mesa (master): broadcom/vc5: Don' t pair VPMSETUP with other peripheral access.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 20b91cd568d82057c4fcf4f864c41896de85c024
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=20b91cd568d82057c4fcf4f864c41896de85c024

Author: Eric Anholt <eric at anholt.net>
Date:   Wed Oct 11 17:40:35 2017 -0700

broadcom/vc5: Don't pair VPMSETUP with other peripheral access.

The specs don't say you can't, but pairing it with an SFU write on the
7268 breaks all our simple shader tests using gl_MVP * gl_Vertex.

---

 src/broadcom/compiler/qpu_schedule.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/broadcom/compiler/qpu_schedule.c b/src/broadcom/compiler/qpu_schedule.c
index b5a0aa9a34..dd221e027e 100644
--- a/src/broadcom/compiler/qpu_schedule.c
+++ b/src/broadcom/compiler/qpu_schedule.c
@@ -590,6 +590,9 @@ qpu_accesses_peripheral(const struct v3d_qpu_instr *inst)
                         return true;
                 }
 
+                if (inst->alu.add.op == V3D_QPU_A_VPMSETUP)
+                        return true;
+
                 if (inst->alu.mul.op != V3D_QPU_M_NOP &&
                     inst->alu.mul.magic_write &&
                     qpu_magic_waddr_is_periph(inst->alu.mul.waddr)) {