Mesa (main): pan/va: Respect assigned slots

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 0fa9204049e043f08d196a82523a0b5bbf6df6b7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0fa9204049e043f08d196a82523a0b5bbf6df6b7

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Wed May 25 09:40:02 2022 -0400

pan/va: Respect assigned slots

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

---

 src/panfrost/bifrost/valhall/va_pack.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/panfrost/bifrost/valhall/va_pack.c b/src/panfrost/bifrost/valhall/va_pack.c
index b0df089f26f..e934fc81941 100644
--- a/src/panfrost/bifrost/valhall/va_pack.c
+++ b/src/panfrost/bifrost/valhall/va_pack.c
@@ -619,10 +619,8 @@ va_pack_instr(const bi_instr *I)
    uint64_t hex = info.exact | (((uint64_t) I->flow) << 59);
    hex |= ((uint64_t) va_select_fau_page(I)) << 57;
 
-   if (info.slot) {
-      uint64_t slot = (I->op == BI_OPCODE_BARRIER) ? 7 : 0;
-      hex |= (slot << 30);
-   }
+   if (info.slot)
+      hex |= ((uint64_t) I->slot << 30);
 
    if (info.sr_count) {
       bool read = bi_opcode_props[I->op].sr_read;