commit e219f04592373560fe39b7dafd2ef42bbc1124d0
author Icecream95 <ixn@keemail.me> Sat Jun 20 17:54:19 2020 +1200
committer Marge Bot <eric+marge@anholt.net> Mon Jun 22 12:15:05 2020 +0000
tree 2138b8c307ccf9dc8f721aa4caf10c42afc3330a
parent 97318994bcc07f2d5bb8a0a432202e88d5ac1503

pan/decode: Fix helper invocations when tracing

midgard1.flags_lo was being changed when tracing, causing helper
invocations to be disabled.

This was found by using mprotect to make BOs read only in
pandecode_fetch_gpu_mem.

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5573>

src/panfrost/pandecode/decode.c

diff --git a/src/panfrost/pandecode/decode.c b/src/panfrost/pandecode/decode.c
index 7635217..1774bed 100644
--- a/src/panfrost/pandecode/decode.c
+++ b/src/panfrost/pandecode/decode.c
@@ -2616,7 +2616,6 @@
                         pandecode_log_cont(",\n");
                 } else {
                         bool helpers = s->midgard1.flags_lo & MALI_HELPER_INVOCATIONS;
-                        s->midgard1.flags_lo &= ~MALI_HELPER_INVOCATIONS;
 
                         if (helpers != info.helper_invocations) {
                                 pandecode_msg("XXX: expected helpers %u but got %u\n",
@@ -2624,7 +2623,8 @@
                         }
 
                         pandecode_log(".midgard1.flags_lo = ");
-                        pandecode_log_decoded_flags(shader_midgard1_flag_lo_info, s->midgard1.flags_lo);
+                        pandecode_log_decoded_flags(shader_midgard1_flag_lo_info,
+                                                    s->midgard1.flags_lo & ~MALI_HELPER_INVOCATIONS);
                         pandecode_log_cont(",\n");
 
                         pandecode_log(".midgard1.flags_hi = ");