summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/vc4/vc4_qpu.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/drivers/vc4/vc4_qpu.c')
-rw-r--r--src/gallium/drivers/vc4/vc4_qpu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/vc4/vc4_qpu.c b/src/gallium/drivers/vc4/vc4_qpu.c
index d74dee5689e..35c65dc2eb3 100644
--- a/src/gallium/drivers/vc4/vc4_qpu.c
+++ b/src/gallium/drivers/vc4/vc4_qpu.c
@@ -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).