From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Thu, 13 Feb 2020 12:41:38 +0000 (-0500)
Subject: pan/midgard: Identify stack barrier flag
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5c06ecd2c64a36496f7a0a1d2811d8a90b1a0620;p=mesa.git

pan/midgard: Identify stack barrier flag

In case thread local storage is used.

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

diff --git a/src/panfrost/midgard/disassemble.c b/src/panfrost/midgard/disassemble.c
index 28557042de3..2634959bc6d 100644
--- a/src/panfrost/midgard/disassemble.c
+++ b/src/panfrost/midgard/disassemble.c
@@ -1336,6 +1336,9 @@ print_texture_barrier(FILE *fp, uint32_t *word)
         if (barrier->shared)
                 fprintf(fp, " | shared");
 
+        if (barrier->stack)
+                fprintf(fp, " | stack");
+
         fprintf(fp, "\n");
 }
 
diff --git a/src/panfrost/midgard/midgard.h b/src/panfrost/midgard/midgard.h
index 286282e9fae..0e650db74e8 100644
--- a/src/panfrost/midgard/midgard.h
+++ b/src/panfrost/midgard/midgard.h
@@ -718,8 +718,9 @@ __attribute__((__packed__))
          * textures, these bits are not yet understood. */
         unsigned barrier_buffer : 1;
         unsigned barrier_shared : 1;
+        unsigned barrier_stack  : 1;
 
-        unsigned unknown4  : 10;
+        unsigned unknown4  : 9;
 
         /* In immediate mode, each offset field is an immediate range [0, 7].
          *
@@ -791,7 +792,8 @@ __attribute__((__packed__))
         unsigned zero3 : 24;
         unsigned buffer : 1;
         unsigned shared : 1;
-        unsigned zero4 : 6;
+        unsigned stack  : 1;
+        unsigned zero4 : 5;
 
         uint64_t zero5;
 } midgard_texture_barrier_word;