From: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Date: Wed, 14 Aug 2019 21:42:07 +0000 (-0700)
Subject: pan/midgard: Fix disassembly termination condition
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6f4d79691180ee7cd342e1d3254ca55c76cc42cd;p=mesa.git

pan/midgard: Fix disassembly termination condition

Fixes: 863bdd1f8dc ("pan/midgard: Break, not return, in disassembler")

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
---

diff --git a/src/panfrost/midgard/disassemble.c b/src/panfrost/midgard/disassemble.c
index 3e18c19593b..28f0b40e476 100644
--- a/src/panfrost/midgard/disassemble.c
+++ b/src/panfrost/midgard/disassemble.c
@@ -1387,8 +1387,6 @@ disassemble_midgard(uint8_t *code, size_t size, bool stats, unsigned nr_register
 
                 unsigned next = (words[i] & 0xF0) >> 4;
 
-                i += 4 * num_quad_words;
-
                 /* We are parsing per bundle anyway */
                 nr_bundles++;
                 nr_quadwords += num_quad_words;
@@ -1401,6 +1399,8 @@ disassemble_midgard(uint8_t *code, size_t size, bool stats, unsigned nr_register
                         if (midgard_word_types[words[i] & 0xF] != midgard_word_type_alu)
                                 break;
                 }
+
+                i += 4 * num_quad_words;
         }
 
         if (stats) {