fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 04:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

v3dv: don't free BOs from imported memory objects

Browse source 
Only free the underlying BO when the exported memory object is freed
to avoid multiple frees of the same memory.

The only exception is winsys BOs where we import a BO created in the
display device into the render device. In this case, we only have one
memory object referencing the BO and we want to destroy it with that
memory object.

Fixes:
dEQP-VK.api.external.memory.dma_buf.*
dEQP-VK.api.external.memory.opaque_fd.*

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6766>
This commit is contained in:
Iago Toral Quiroga 2020-06-23 13:36:15 +02:00 • committed by Marge Bot
parent ddb352b8f9
commit d809d9f3f6
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/broadcom/vulkan/v3dv_device.c
View file

@ -1373,7 +1373,10 @@ device_alloc(struct v3dv_device *device,
static void
device_free(struct v3dv_device *device, struct v3dv_device_memory *mem)
{
v3dv_bo_free(device, mem->bo);
if (mem->has_bo_ownership)
v3dv_bo_free(device, mem->bo);
else if (mem->bo)
vk_free(&device->alloc, mem->bo);
}
static void
@ -1457,6 +1460,7 @@ device_import_bo(struct v3dv_device *device,
(*bo)->offset = get_offset.offset;
(*bo)->map = NULL;
(*bo)->map_size = 0;
(*bo)->private = false;
return VK_SUCCESS;
@ -1506,7 +1510,6 @@ device_alloc_for_wsi(struct v3dv_device *device,
if (result != VK_SUCCESS)
goto fail_import;
return VK_SUCCESS;
fail_import:
@ -1544,6 +1547,7 @@ v3dv_AllocateMemory(VkDevice _device,
assert(pAllocateInfo->memoryTypeIndex < pdevice->memory.memoryTypeCount);
mem->type = &pdevice->memory.memoryTypes[pAllocateInfo->memoryTypeIndex];
mem->has_bo_ownership = true;
const struct wsi_memory_allocate_info *wsi_info = NULL;
const VkImportMemoryFdInfoKHR *fd_info = NULL;
@ -1571,6 +1575,7 @@ v3dv_AllocateMemory(VkDevice _device,
result = device_import_bo(device, pAllocator,
fd_info->fd, pAllocateInfo->allocationSize,
&mem->bo);
mem->has_bo_ownership = false;
if (result == VK_SUCCESS)
close(fd_info->fd);
} else {

1
src/broadcom/vulkan/v3dv_private.h
View file

@ -312,6 +312,7 @@ struct v3dv_device {
struct v3dv_device_memory {
struct v3dv_bo *bo;
const VkMemoryType *type;
bool has_bo_ownership;
};
#define V3D_OUTPUT_IMAGE_FORMAT_NO 255