From 80355ce5332e7f655b86049098330c64fc939f8e Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Mon, 2 Aug 2021 14:27:11 +0200
Subject: [PATCH] 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@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@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 a5a04f5c0be..60a8ed4c939 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -427,7 +427,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 ed3a6e8168f..94c85fa95de 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++;
    }