From f8cbd4d301e2b51a03871d0ace7dbd398a6b122d Mon Sep 17 00:00:00 2001 From: "Thomas H.P. Andersen" Date: Wed, 7 Jul 2021 16:50:05 +0200 Subject: [PATCH] broadcom/compiler: fix add vs. mul Spotted by a compile warning Fixes: 7f61ff7b4d1 ("broadcom/compiler: Merge instructions more efficiently") Reviewed-by: Iago Torral Quiroga Part-of: (cherry picked from commit cf05a7e66fa3e0ff2003cf419bc93f8a69225a03) --- .pick_status.json | 2 +- src/broadcom/compiler/qpu_schedule.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index c45612ddf1e..d6f6914ccaa 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -193,7 +193,7 @@ "description": "broadcom/compiler: fix add vs. mul", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "7f61ff7b4d1dfe791264148ff3cbe8b03c76aeca" }, diff --git a/src/broadcom/compiler/qpu_schedule.c b/src/broadcom/compiler/qpu_schedule.c index 1bcff238b3b..8af2e8ef2da 100644 --- a/src/broadcom/compiler/qpu_schedule.c +++ b/src/broadcom/compiler/qpu_schedule.c @@ -821,7 +821,7 @@ qpu_merge_raddrs(struct v3d_qpu_instr *result, if (mul_instr->alu.mul.a == V3D_QPU_MUX_A) result->alu.mul.a = V3D_QPU_MUX_B; if (mul_instr->alu.mul.b == V3D_QPU_MUX_A && - v3d_qpu_add_op_num_src(mul_instr->alu.mul.op) > 1) { + v3d_qpu_mul_op_num_src(mul_instr->alu.mul.op) > 1) { result->alu.mul.b = V3D_QPU_MUX_B; } }