diff options
| author | Eric Anholt <[email protected]> | 2014-08-24 17:53:00 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2014-08-24 22:13:26 -0700 |
| commit | 78d144f7de8cad42dfe588a667e105543f6b2e4b (patch) | |
| tree | 5027edadb2bb3229024e2a9abdb0a2f0d8e26fa2 | |
| parent | 54499a85fff415e5c627a44d27a3592b6633bd4b (diff) | |
vc4: Set the other WADDR in the qpu instruction helpers.
Now you don't need to qpu_inst() your instruction with a NOP to get the
other waddr set.
| -rw-r--r-- | src/gallium/drivers/vc4/vc4_qpu.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/drivers/vc4/vc4_qpu.c b/src/gallium/drivers/vc4/vc4_qpu.c index b8649f7b628..bf385e3fe3f 100644 --- a/src/gallium/drivers/vc4/vc4_qpu.c +++ b/src/gallium/drivers/vc4/vc4_qpu.c @@ -107,6 +107,7 @@ qpu_a_MOV(struct qpu_reg dst, struct qpu_reg src) inst |= QPU_SET_FIELD(src.mux, QPU_ADD_B); inst |= set_src_raddr(inst, src); inst |= QPU_SET_FIELD(QPU_SIG_NONE, QPU_SIG); + inst |= QPU_SET_FIELD(QPU_W_NOP, QPU_WADDR_MUL); return inst; } @@ -123,6 +124,7 @@ qpu_m_MOV(struct qpu_reg dst, struct qpu_reg src) inst |= QPU_SET_FIELD(src.mux, QPU_MUL_B); inst |= set_src_raddr(inst, src); inst |= QPU_SET_FIELD(QPU_SIG_NONE, QPU_SIG); + inst |= QPU_SET_FIELD(QPU_W_NOP, QPU_WADDR_ADD); return inst; } @@ -133,7 +135,7 @@ qpu_load_imm_ui(struct qpu_reg dst, uint32_t val) uint64_t inst = 0; inst |= qpu_a_dst(dst); - inst |= qpu_m_dst(qpu_rb(QPU_W_NOP)); + inst |= QPU_SET_FIELD(QPU_W_NOP, QPU_WADDR_MUL); inst |= QPU_SET_FIELD(QPU_COND_ALWAYS, QPU_COND_ADD); inst |= QPU_SET_FIELD(QPU_COND_ALWAYS, QPU_COND_MUL); inst |= QPU_SET_FIELD(QPU_SIG_LOAD_IMM, QPU_SIG); @@ -156,6 +158,7 @@ qpu_a_alu2(enum qpu_op_add op, inst |= QPU_SET_FIELD(src1.mux, QPU_ADD_B); inst |= set_src_raddr(inst, src1); inst |= QPU_SET_FIELD(QPU_SIG_NONE, QPU_SIG); + inst |= QPU_SET_FIELD(QPU_W_NOP, QPU_WADDR_MUL); return inst; } @@ -177,6 +180,7 @@ qpu_m_alu2(enum qpu_op_mul op, inst |= QPU_SET_FIELD(src1.mux, QPU_MUL_B); inst |= set_src_raddr(inst, src1); inst |= QPU_SET_FIELD(QPU_SIG_NONE, QPU_SIG); + inst |= QPU_SET_FIELD(QPU_W_NOP, QPU_WADDR_ADD); return inst; } |