Mesa (master): broadcom/qpu: set VC5_QPU_RADDR_A out of the switch at _pack_branch

[GitLab Mirror]

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

Author: Neil Roberts <nroberts at igalia.com>
Date:   Sun Jul  5 15:45:19 2020 +0200

broadcom/qpu: set VC5_QPU_RADDR_A out of the switch at _pack_branch

Detected after mesa added Wimplicit-fallthrough project wide.

Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5769>

---

 src/broadcom/qpu/qpu_pack.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/broadcom/qpu/qpu_pack.c b/src/broadcom/qpu/qpu_pack.c
index e70daf55a9f..7502bbfb9d6 100644
--- a/src/broadcom/qpu/qpu_pack.c
+++ b/src/broadcom/qpu/qpu_pack.c
@@ -1452,14 +1452,14 @@ v3d_qpu_instr_pack_branch(const struct v3d_device_info *devinfo,
 
                 *packed_instr |= QPU_SET_FIELD(instr->branch.offset >> 24,
                                                VC5_QPU_BRANCH_ADDR_HIGH);
+        default:
+                break;
+        }
 
-        case V3D_QPU_BRANCH_DEST_REGFILE:
+        if (instr->branch.bdi == V3D_QPU_BRANCH_DEST_REGFILE ||
+            instr->branch.bdu == V3D_QPU_BRANCH_DEST_REGFILE) {
                 *packed_instr |= QPU_SET_FIELD(instr->branch.raddr_a,
                                                VC5_QPU_RADDR_A);
-                break;
-
-        default:
-                break;
         }
 
         return true;