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

panvk: Close the panfrost device in the panvk_physical_device_init() error path 

Otherwise some resources stay around.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12762>
This commit is contained in:
Boris Brezillon 2021-09-06 16:12:08 +02:00
parent f0be7dc745
commit 4a178cf858
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/panfrost/vulkan/panvk_device.c
View File

@ -303,6 +303,7 @@ panvk_physical_device_init(struct panvk_physical_device *device,
device->master_fd = master_fd;
device->pdev.debug = PAN_DBG_TRACE;
panfrost_open_device(NULL, fd, &device->pdev);
fd = -1;
if (device->pdev.quirks & MIDGARD_SFBD) {
result = vk_errorf(instance, VK_ERROR_INCOMPATIBLE_DRIVER,
@ -319,7 +320,7 @@ panvk_physical_device_init(struct panvk_physical_device *device,
if (panvk_device_get_cache_uuid(device->pdev.gpu_id, device->cache_uuid)) {
result = vk_errorf(instance, VK_ERROR_INITIALIZATION_FAILED,
"cannot generate UUID");
goto fail;
goto fail_close_device;
}
fprintf(stderr, "WARNING: panvk is not a conformant vulkan implementation, "
@ -331,13 +332,16 @@ panvk_physical_device_init(struct panvk_physical_device *device,
result = panvk_wsi_init(device);
if (result != VK_SUCCESS) {
vk_error(instance, result);
goto fail;
goto fail_close_device;
}
return VK_SUCCESS;
fail_close_device:
panfrost_close_device(&device->pdev);
fail:
close(fd);
if (fd != -1)
close(fd);
if (master_fd != -1)
close(master_fd);
return result;