KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

turnip: Free disk cache on pdev init failure. 

Noticed while debugging test failure under valgrind (the disk cache
doesn't come from the vulkan allocator, so we could leak it and not fail
the test).

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13200>
This commit is contained in:
Emma Anholt 2021-10-05 10:34:01 -07:00 committed by Marge Bot
parent 36d761f2a5
commit 591afd1d52
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/freedreno/vulkan/tu_device.c
View File

@ -221,7 +221,7 @@ tu_physical_device_init(struct tu_physical_device *device,
if (!info) {
result = vk_startup_errorf(instance, VK_ERROR_INITIALIZATION_FAILED,
"device %s is unsupported", device->name);
goto fail;
goto fail_free_name;
}
switch (fd_dev_gen(&device->dev_id)) {
case 6:
@ -233,12 +233,12 @@ tu_physical_device_init(struct tu_physical_device *device,
default:
result = vk_startup_errorf(instance, VK_ERROR_INITIALIZATION_FAILED,
"device %s is unsupported", device->name);
goto fail;
goto fail_free_name;
}
if (tu_device_get_cache_uuid(fd_dev_gpu_id(&device->dev_id), device->cache_uuid)) {
result = vk_startup_errorf(instance, VK_ERROR_INITIALIZATION_FAILED,
"cannot generate UUID");
goto fail;
goto fail_free_name;
}
/* The gpu id is already embedded in the uuid so we just pass "tu"
@ -264,20 +264,22 @@ tu_physical_device_init(struct tu_physical_device *device,
&supported_extensions,
&dispatch_table);
if (result != VK_SUCCESS)
goto fail;
goto fail_free_cache;
#if TU_HAS_SURFACE
result = tu_wsi_init(device);
if (result != VK_SUCCESS) {
vk_startup_errorf(instance, result, "WSI init failure");
vk_physical_device_finish(&device->vk);
goto fail;
goto fail_free_cache;
}
#endif
return VK_SUCCESS;
fail:
fail_free_cache:
disk_cache_destroy(device->disk_cache);
fail_free_name:
vk_free(&instance->vk.alloc, (void *)device->name);
return result;
}