From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Fri, 24 Jan 2020 02:20:16 +0000 (-0500)
Subject: pan/midgard: Validate barriers use a barrier tag
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5a271df028481c6b92fac0cff79703bf6035f6eb;p=mesa.git

pan/midgard: Validate barriers use a barrier tag

...and that non-barriers don't use a barrier tag. It's not clear what
the difference means quite yet, though.

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

diff --git a/src/panfrost/midgard/disassemble.c b/src/panfrost/midgard/disassemble.c
index a3eddaa514a..f99a13f2908 100644
--- a/src/panfrost/midgard/disassemble.c
+++ b/src/panfrost/midgard/disassemble.c
@@ -1288,6 +1288,9 @@ print_texture_barrier(FILE *fp, uint32_t *word)
 {
         midgard_texture_barrier_word *barrier = (midgard_texture_barrier_word *) word;
 
+        if (barrier->type != 0x4)
+                fprintf(fp, "/* barrier tag %X != 0x4 */ ", barrier->type);
+
         if (!barrier->cont)
                 fprintf(fp, "/* cont missing? */");
 
@@ -1329,7 +1332,8 @@ print_texture_word(FILE *fp, uint32_t *word, unsigned tabs, unsigned in_reg_base
         if (texture->op == TEXTURE_OP_BARRIER) {
                 print_texture_barrier(fp, word);
                 return;
-        }
+        } else  if (texture->type == 0x4)
+                fprintf (fp, "/* nonbarrier had tag 0x4 */ ");
 
         /* Specific format in question */
         print_texture_format(fp, texture->format);