Mesa (staging/21.2): pan/bi: Correct the sr_count on +ST_TILE

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 514270a689d509147229e8f96d6a75d77b786e17
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=514270a689d509147229e8f96d6a75d77b786e17

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Wed Aug 18 22:05:17 2021 +0000

pan/bi: Correct the sr_count on +ST_TILE

Otherwise we'll get validator fails when emitting +ST_TILE.

Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12478>
(cherry picked from commit 5c2a4eb1c241e6eaa91263d6957a7186c58065f0)

---

 .pick_status.json            | 2 +-
 src/panfrost/bifrost/ISA.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 51b6a7da975..a7fdcc5a01c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -778,7 +778,7 @@
         "description": "pan/bi: Correct the sr_count on +ST_TILE",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/panfrost/bifrost/ISA.xml b/src/panfrost/bifrost/ISA.xml
index 8db5ae03765..09e2672eb4c 100644
--- a/src/panfrost/bifrost/ISA.xml
+++ b/src/panfrost/bifrost/ISA.xml
@@ -7653,7 +7653,7 @@
     </mod>
   </ins>
 
-  <ins name="+ST_TILE" staging="r=vecsize" mask="0xff800" exact="0xcb800" message="tile" dests="0">
+  <ins name="+ST_TILE" staging="r=format" mask="0xff800" exact="0xcb800" message="tile" dests="0">
     <src start="0"/>
     <src start="3"/>
     <src start="6" mask="0xf7"/>