fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 15:48:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nvk: Clean up the disk cache on physical device create fail path

Browse source 
Fixes: a4f8fd9dd5 ("nvk: Hook up the disk cache")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25749>
This commit is contained in:
Faith Ekstrand 2023-10-16 05:57:21 -05:00
parent 922e6e5423
commit 7a83109835
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/nouveau/vulkan/nvk_physical_device.c
View file

@ -813,7 +813,7 @@ nvk_create_drm_physical_device(struct vk_instance *_instance,
if (!os_get_available_system_memory(&sysmem_size_B)) {
result = vk_errorf(instance, VK_ERROR_INITIALIZATION_FAILED,
"Failed to query available system memory");
goto fail_init;
goto fail_disk_cache;
}
if (pdev->info.vram_size_B) {
@ -844,13 +844,14 @@ nvk_create_drm_physical_device(struct vk_instance *_instance,
result = nvk_init_wsi(pdev);
if (result != VK_SUCCESS)
goto fail_init;
goto fail_disk_cache;
*pdev_out = &pdev->vk;
return VK_SUCCESS;
fail_init:
fail_disk_cache:
nvk_physical_device_free_disk_cache(pdev);
vk_physical_device_finish(&pdev->vk);
fail_alloc:
vk_free(&instance->vk.alloc, pdev);