From 661d28cfece72d4e08d1d5057be283f21cbab2f5 Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Thu, 31 Aug 2023 15:13:27 +0200
Subject: [PATCH] radv: restore sampling CPU/GPU clocks before starting SQTT
 trace

This was removed by mistake in "radv/rgp: Use common trace trigger"
and it introduced a regression with RGP queue events.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22779>
---
 src/amd/vulkan/layers/radv_sqtt_layer.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/amd/vulkan/layers/radv_sqtt_layer.c b/src/amd/vulkan/layers/radv_sqtt_layer.c
index 8ea977c18d8..ab11943cd8f 100644
--- a/src/amd/vulkan/layers/radv_sqtt_layer.c
+++ b/src/amd/vulkan/layers/radv_sqtt_layer.c
@@ -580,6 +580,11 @@ radv_handle_sqtt(VkQueue _queue)
          return;
       }
 
+      /* Sample CPU/GPU clocks before starting the trace. */
+      if (!radv_sqtt_sample_clocks(queue->device)) {
+         fprintf(stderr, "radv: Failed to sample clocks\n");
+      }
+
       radv_begin_sqtt(queue);
       assert(!queue->device->sqtt_enabled);
       queue->device->sqtt_enabled = true;