From a658be8a2432b5fd65ec65317bbf605e02ca38ec Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 11 Sep 2025 12:38:59 +0200 Subject: [PATCH] radv: get NIR options after initializing the physical device cache key Otherwise, radv_split_fma isn't considered. Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13878 Fixes: 7304423b5c6 ("radv: mark RADV_DEBUG=splitfma as deprecated") Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_physical_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_physical_device.c b/src/amd/vulkan/radv_physical_device.c index 2c27a344790..13e88a0f3ae 100644 --- a/src/amd/vulkan/radv_physical_device.c +++ b/src/amd/vulkan/radv_physical_device.c @@ -2384,8 +2384,6 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm radv_physical_device_get_supported_extensions(pdev, &pdev->vk.supported_extensions); radv_physical_device_get_features(pdev, &pdev->vk.supported_features); - radv_get_nir_options(pdev); - #ifndef _WIN32 if (drm_device) { struct stat primary_stat = {0}, render_stat = {0}; @@ -2413,6 +2411,8 @@ radv_physical_device_try_create(struct radv_instance *instance, drmDevicePtr drm radv_physical_device_init_cache_key(pdev); + radv_get_nir_options(pdev); + if (radv_device_get_cache_uuid(pdev, pdev->cache_uuid)) { result = vk_errorf(instance, VK_ERROR_INITIALIZATION_FAILED, "cannot generate UUID"); goto fail_wsi;