commit 45ac8ea8bd8541d0a6d861dc84a66fa8fa69fb09
author Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Mon Nov 04 10:32:49 2019 -0500
committer Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Mon Nov 04 15:36:08 2019 -0500
tree d0219b7b38bf3d8617c113e08abe83a1ad4f8394
parent 0a77dd32035501d976550928b7c65f7ae28a3e71

pan/midgard: Fix quadword_count handling

Spilling can mess with this considerably.

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

src/panfrost/midgard/midgard_compile.c

diff --git a/src/panfrost/midgard/midgard_compile.c b/src/panfrost/midgard/midgard_compile.c
index 2604bbe..22c0d44 100644
--- a/src/panfrost/midgard/midgard_compile.c
+++ b/src/panfrost/midgard/midgard_compile.c
@@ -2359,10 +2359,10 @@
         unsigned first_tag = 0;
 
         mir_foreach_block_from(ctx, initial_block, v) {
-                midgard_bundle *initial_bundle =
-                        util_dynarray_element(&v->bundles, midgard_bundle, 0);
+                if (v->quadword_count) {
+                        midgard_bundle *initial_bundle =
+                                util_dynarray_element(&v->bundles, midgard_bundle, 0);
 
-                if (initial_bundle) {
                         first_tag = initial_bundle->tag;
                         break;
                 }