fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-18 04:00:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

venus: defer roundtrip waiting to vkFreeMemory time

Browse source 
bo allocations for the below cases are after device memory allocation:

1. direct non-external mappable memory allocation
2. pool grow
3. exportable memory allocation

For (1) and (2), the bo is for mapping, which is a pure kernel operation
to happen later. So roundtrip waiting can be deferred until free memory.

For (3), the bo is for either fd export or mapping, which are both pure
kernel operations. So roundtrip waiting can also be deferred until free
memory.

Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Chia-I Wu <olvaffe@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13874>
This commit is contained in:
Yiwei Zhang 2021-11-28 00:04:11 +00:00 • committed by Marge Bot
parent 9fa3e3df9e
commit 86b3a4e6aa
2 changed files with 30 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/virtio/vulkan/vn_device_memory.c
View file

@ -61,16 +61,24 @@ vn_device_memory_pool_grow_alloc(struct vn_device *dev,
result = vn_renderer_bo_create_from_device_memory(
dev->renderer, mem->size, mem->base.id, mem_flags, 0, &mem->base_bo);
if (result != VK_SUCCESS) {
assert(!mem->base_bo);
goto fail;
}
result =
vn_instance_submit_roundtrip(dev->instance, &mem->bo_roundtrip_seqno);
if (result != VK_SUCCESS)
goto fail;
vn_instance_roundtrip(dev->instance);
mem->bo_roundtrip_seqno_valid = true;
*out_mem = mem;
return VK_SUCCESS;
fail:
if (mem->base_bo)
vn_renderer_bo_unref(dev->renderer, mem->base_bo);
if (mem_handle != VK_NULL_HANDLE)
vn_async_vkFreeMemory(dev->instance, dev_handle, mem_handle, NULL);
vn_object_base_fini(&mem->base);
@ -100,6 +108,10 @@ vn_device_memory_pool_unref(struct vn_device *dev,
if (!vn_renderer_bo_unref(dev->renderer, pool_mem->base_bo))
return;
/* wait on valid bo_roundtrip_seqno before vkFreeMemory */
if (pool_mem->bo_roundtrip_seqno_valid)
vn_instance_wait_roundtrip(dev->instance, pool_mem->bo_roundtrip_seqno);
vn_async_vkFreeMemory(dev->instance, vn_device_to_handle(dev),
vn_device_memory_to_handle(pool_mem), NULL);
vn_object_base_fini(&pool_mem->base);
@ -292,7 +304,15 @@ vn_device_memory_alloc(struct vn_device *dev,
return result;
}
vn_instance_roundtrip(dev->instance);
result =
vn_instance_submit_roundtrip(dev->instance, &mem->bo_roundtrip_seqno);
if (result != VK_SUCCESS) {
vn_renderer_bo_unref(dev->renderer, mem->base_bo);
vn_async_vkFreeMemory(dev->instance, dev_handle, mem_handle, NULL);
return result;
}
mem->bo_roundtrip_seqno_valid = true;
return VK_SUCCESS;
}
@ -399,6 +419,10 @@ vn_FreeMemory(VkDevice device,
} else {
if (mem->base_bo)
vn_renderer_bo_unref(dev->renderer, mem->base_bo);
if (mem->bo_roundtrip_seqno_valid)
vn_instance_wait_roundtrip(dev->instance, mem->bo_roundtrip_seqno);
vn_async_vkFreeMemory(dev->instance, device, memory, NULL);
}

3
src/virtio/vulkan/vn_device_memory.h
View file

@ -28,6 +28,9 @@ struct vn_device_memory {
struct vn_device_memory *base_memory;
/* non-NULL when mappable or external */
struct vn_renderer_bo *base_bo;
/* enforce kernel and ring ordering between memory export and free */
bool bo_roundtrip_seqno_valid;
uint32_t bo_roundtrip_seqno;
VkDeviceSize base_offset;
VkDeviceSize map_end;