vc4: Ignore WADDRs from the other half of the instruction when merging.

This allows setting the opposite-side WADDR to NOP (a non-zero value) in
qpu_* helpers, so that we don't need to qpu_inst() merge them with NOPs
all the time just to get the waddr set.
This commit is contained in:
Eric Anholt 2014-08-24 17:43:02 -07:00
parent 3212bafc28
commit 1a7035f386

View file

@ -192,7 +192,8 @@ qpu_m_alu2(enum qpu_op_mul op,
uint64_t
qpu_inst(uint64_t add, uint64_t mul)
{
uint64_t merge = add | mul;
uint64_t merge = ((add & ~QPU_WADDR_MUL_MASK) |
(mul & ~QPU_WADDR_ADD_MASK));
/* If either one has no signal field, then use the other's signal field.
* (since QPU_SIG_NONE != 0).