From 09b23c42f9cb72dd1b4c994ce0548c48a902030e Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Wed, 17 Feb 2021 10:19:57 +0100 Subject: [PATCH] radv: move SQTT parameters initialization to radv_thread_trace_init() Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Nieuwenhuizen Part-of: --- src/amd/vulkan/radv_device.c | 11 +---------- src/amd/vulkan/radv_private.h | 3 +++ src/amd/vulkan/radv_sqtt.c | 9 +++++++++ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 5e07a5c99dc..31873870af9 100644 --- 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 51b1f55c93a..9ead1ef5282 100644 --- 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 0fdee89a8cb..12f32ca0d6f 100644 --- 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;