radv: move SQTT parameters initialization to radv_thread_trace_init()

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/9097>

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 5e07a5c99dc2ac8b4724566b0ab93cc444cd7a1e..31873870af918c8679699118846c1d97fe75cb92 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -2636,7 +2636,7 @@ radv_device_init_gs_info(struct radv_device *device)
                                                       device->physical_device->rad_info.family);
 }
 
-static int
+int
 radv_get_int_debug_option(const char *name, int default_value)
 {
        const char *str;
@@ -2984,15 +2984,6 @@ VkResult radv_CreateDevice(
                        abort();
                }
 
-               /* Default buffer size set to 1MB per SE. */
-               device->thread_trace.buffer_size =
-                       radv_get_int_debug_option("RADV_THREAD_TRACE_BUFFER_SIZE", 1024 * 1024);
-               device->thread_trace.start_frame = radv_get_int_debug_option("RADV_THREAD_TRACE", -1);
-
-               const char *trigger_file = getenv("RADV_THREAD_TRACE_TRIGGER");
-               if (trigger_file)
-                       device->thread_trace.trigger_file = strdup(trigger_file);
-
                if (!radv_thread_trace_init(device))
                        goto fail;
        }

diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 51b1f55c93a9518f8afece1d180bf9cc9ef2305b..9ead1ef52828d4391a6f740585e67469b787d7aa 100644 (file)
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -1191,6 +1191,9 @@ radv_get_debug_option_name(int id);
 const char *
 radv_get_perftest_option_name(int id);
 
+int
+radv_get_int_debug_option(const char *name, int default_value);
+
 struct radv_color_buffer_info {
        uint64_t cb_color_base;
        uint64_t cb_color_cmask;

diff --git a/src/amd/vulkan/radv_sqtt.c b/src/amd/vulkan/radv_sqtt.c
index 0fdee89a8cb4df0f0c4c7eaf1ccf43e76f1a12cb..12f32ca0d6f579f8fba3d313fb083d96b95dfc56 100644 (file)
--- a/src/amd/vulkan/radv_sqtt.c
+++ b/src/amd/vulkan/radv_sqtt.c
@@ -430,6 +430,15 @@ radv_thread_trace_init_bo(struct radv_device *device)
 bool
 radv_thread_trace_init(struct radv_device *device)
 {
+       /* Default buffer size set to 1MB per SE. */
+       device->thread_trace.buffer_size =
+               radv_get_int_debug_option("RADV_THREAD_TRACE_BUFFER_SIZE", 1024 * 1024);
+       device->thread_trace.start_frame = radv_get_int_debug_option("RADV_THREAD_TRACE", -1);
+
+       const char *trigger_file = getenv("RADV_THREAD_TRACE_TRIGGER");
+       if (trigger_file)
+               device->thread_trace.trigger_file = strdup(trigger_file);
+
        if (!radv_thread_trace_init_bo(device))
                return false;