From 748a7e1a44bb6b5f390e7385c2f6b849b870438b Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Thu, 13 Aug 2020 17:15:11 -0400
Subject: [PATCH] pan/mdg: Ensure barrier op is set on texture

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Fixes: 92c808cd475 ("pan/mdg: eliminate references to ins->texture.op")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6321>
(cherry picked from commit 06c31031e7e87d83747e3f531f8fd5264c03dc08)
---
 .pick_status.json                   | 2 +-
 src/panfrost/midgard/midgard_emit.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 0dc4cc6a395..c3b9eb83c1b 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1282,7 +1282,7 @@
         "description": "pan/mdg: Ensure barrier op is set on texture",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "92c808cd475c69841eaaf020505208f286ad38cc"
     },
diff --git a/src/panfrost/midgard/midgard_emit.c b/src/panfrost/midgard/midgard_emit.c
index 8c08818214c..8b022554a94 100644
--- a/src/panfrost/midgard/midgard_emit.c
+++ b/src/panfrost/midgard/midgard_emit.c
@@ -903,6 +903,7 @@ emit_binary_bundle(compiler_context *ctx,
                 /* Nothing else to pack for barriers */
                 if (ins->op == TEXTURE_OP_BARRIER) {
                         ins->texture.cont = ins->texture.last = 1;
+                        ins->texture.op = ins->op;
                         util_dynarray_append(emission, midgard_texture_word, ins->texture);
                         return;
                 }