From: Rhys Perry <pendingchaos02@gmail.com>
Date: Tue, 16 Jun 2020 17:09:07 +0000 (+0100)
Subject: aco: fix waitcnt insertion on GFX10.3
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5718f7c8a7891d881a5b374975b1e8e7f8ead05e;p=mesa.git

aco: fix waitcnt insertion on GFX10.3

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5546>
---

diff --git a/src/amd/compiler/aco_insert_waitcnt.cpp b/src/amd/compiler/aco_insert_waitcnt.cpp
index 466158f81f3..db0c7c0d68c 100644
--- a/src/amd/compiler/aco_insert_waitcnt.cpp
+++ b/src/amd/compiler/aco_insert_waitcnt.cpp
@@ -155,6 +155,7 @@ struct wait_imm {
       assert(exp == unset_counter || exp <= 0x7);
       switch (chip) {
       case GFX10:
+      case GFX10_3:
          assert(lgkm == unset_counter || lgkm <= 0x3f);
          assert(vm == unset_counter || vm <= 0x3f);
          imm = ((vm & 0x30) << 10) | ((lgkm & 0x3f) << 8) | ((exp & 0x7) << 4) | (vm & 0xf);