From 4e57b4680d3ca5a6c56686040fcde517494a7049 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Mon, 31 Aug 2020 14:04:55 -0400
Subject: [PATCH] pan/mdg: Fix discard encoding

Let's match the blob.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6525>
(cherry picked from commit c8ac01af33a5bc63822915f08f89a7dbaf7d433f)
---
 .pick_status.json                   | 2 +-
 src/panfrost/midgard/midgard_emit.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index f00c47ae5a9..5fce8b99bb4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -625,7 +625,7 @@
         "description": "pan/mdg: Fix discard encoding",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/src/panfrost/midgard/midgard_emit.c b/src/panfrost/midgard/midgard_emit.c
index 8b022554a94..964ee560dd9 100644
--- a/src/panfrost/midgard/midgard_emit.c
+++ b/src/panfrost/midgard/midgard_emit.c
@@ -641,7 +641,8 @@ emit_branch(midgard_instruction *ins,
         int quadword_offset = 0;
 
         if (is_discard) {
-                /* Ignored */
+                /* Fixed encoding, not actually an offset */
+                quadword_offset = 0x2;
         } else if (is_tilebuf_wait) {
                 quadword_offset = -1;
         } else if (target_number > block->base.name) {