From 60c53f5e63dd0a2e46032704719ec0666589528d Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Tue, 17 Sep 2024 16:02:18 +0200 Subject: [PATCH] radv: Initialize sqtt state before meta state Sqtt needs to be initialized before BVH build pipelines are compiled to avoid crashes on startup. Fixes: 5fa22f9 ("radv: regroup all tools initialization in one helper") Part-of: --- src/amd/vulkan/radv_device.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c index 4516cc1d47a..6d91cbe5598 100644 --- a/src/amd/vulkan/radv_device.c +++ b/src/amd/vulkan/radv_device.c @@ -1242,6 +1242,10 @@ radv_CreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCr /* Initialize the per-device cache key before compiling meta shaders. */ radv_device_init_cache_key(device); + result = radv_device_init_tools(device); + if (result != VK_SUCCESS) + goto fail; + result = radv_device_init_meta(device); if (result != VK_SUCCESS) goto fail; @@ -1297,10 +1301,6 @@ radv_CreateDevice(VkPhysicalDevice physicalDevice, const VkDeviceCreateInfo *pCr device->capture_replay_arena_vas = _mesa_hash_table_u64_create(NULL); } - result = radv_device_init_tools(device); - if (result != VK_SUCCESS) - goto fail_cache; - if (pdev->info.gfx_level == GFX11 && pdev->info.has_dedicated_vram && instance->drirc.force_pstate_peak_gfx11_dgpu) { if (!radv_device_acquire_performance_counters(device)) fprintf(stderr, "radv: failed to set pstate to profile_peak.\n");