Mesa (master): pan/bi: Fix unused port swapping

[GitLab Mirror]

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

Author: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Date:   Tue Mar 31 13:37:12 2020 -0400

pan/bi: Fix unused port swapping

Fixes INSTR_INVALID_ENC

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4396>

---

 src/panfrost/bifrost/bi_pack.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/panfrost/bifrost/bi_pack.c b/src/panfrost/bifrost/bi_pack.c
index 94a62edb471..293a109eb5a 100644
--- a/src/panfrost/bifrost/bi_pack.c
+++ b/src/panfrost/bifrost/bi_pack.c
@@ -362,6 +362,15 @@ bi_pack_registers(struct bi_registers regs)
                 }
         }
 
+        /* When port 3 isn't used, we have to set it to port 2, and vice versa,
+         * or we an INSTR_INVALID_ENC is raised. The reason is unknown. */
+
+        if (!regs.port[3])
+                regs.port[3] = regs.port[2];
+
+        if (!regs.port[2])
+                regs.port[2] = regs.port[3];
+
         s.reg3 = regs.port[3];
         s.reg2 = regs.port[2];
         s.uniform_const = regs.uniform_constant;