Mesa (staging/21.2): radv: fix selecting the first active CU when profiling with SQTT

[GitLab Mirror]

Module: Mesa
Branch: staging/21.2
Commit: 5b4b4b9ef6171a8633af76fee778081ee66d3882
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b4b4b9ef6171a8633af76fee778081ee66d3882

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon Aug  2 14:27:11 2021 +0200

radv: fix selecting the first active CU when profiling with SQTT

Fixes: d26bcc0f5cb ("radv: always select the first active CU when profiling with SQTT")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12167>
(cherry picked from commit ebea075feb820fb4e2118690da8258aa830ba3a3)

---

 .pick_status.json          | 2 +-
 src/amd/vulkan/radv_sqtt.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index c42c5177853..9bb22657061 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -130,7 +130,7 @@
         "description": "radv: fix selecting the first active CU when profiling with SQTT",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "d26bcc0f5cba8e578ba0e1f052e76abf61919ea8"
     },
diff --git a/src/amd/vulkan/radv_sqtt.c b/src/amd/vulkan/radv_sqtt.c
index c23ca4ba7c3..bd874cb9d21 100644
--- a/src/amd/vulkan/radv_sqtt.c
+++ b/src/amd/vulkan/radv_sqtt.c
@@ -625,8 +625,6 @@ radv_get_thread_trace(struct radv_queue *queue, struct ac_thread_trace *thread_t
                                         ? (first_active_cu / 2)
                                         : first_active_cu;
 
-      thread_trace_se.compute_unit = 0;
-
       thread_trace->traces[thread_trace->num_traces] = thread_trace_se;
       thread_trace->num_traces++;
    }