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

anv: Integrate gem vm bind and unbind kmd backend functions

Browse source 
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21698>
This commit is contained in:
José Roberto de Souza 2022-08-09 10:26:54 -07:00 • committed by Marge Bot
parent 37fa2fa30e
commit 43e21702f6
1 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/intel/vulkan/anv_allocator.c
View file

@ -1372,11 +1372,8 @@ anv_bo_alloc_flags_to_bo_flags(struct anv_device *device,
}
static void
anv_bo_finish(struct anv_device *device, struct anv_bo *bo)
anv_bo_unmap_close(struct anv_device *device, struct anv_bo *bo)
{
if (bo->offset != 0 && !bo->has_fixed_address)
anv_vma_free(device, bo->offset, bo->size + bo->_ccs_size);
if (bo->map && !bo->from_host_ptr)
anv_device_unmap_bo(device, bo, bo->map, bo->size);
@ -1384,6 +1381,22 @@ anv_bo_finish(struct anv_device *device, struct anv_bo *bo)
device->kmd_backend->gem_close(device, bo->gem_handle);
}
static void anv_bo_vma_free(struct anv_device *device, struct anv_bo *bo)
{
if (bo->offset != 0 && !bo->has_fixed_address)
anv_vma_free(device, bo->offset, bo->size + bo->_ccs_size);
}
static void
anv_bo_finish(struct anv_device *device, struct anv_bo *bo)
{
/* Not releasing vma in case unbind fails */
if (device->kmd_backend->gem_vm_unbind(device, bo) == 0)
anv_bo_vma_free(device, bo);
anv_bo_unmap_close(device, bo);
}
static VkResult
anv_bo_vma_alloc_or_close(struct anv_device *device,
struct anv_bo *bo,
@ -1411,7 +1424,7 @@ anv_bo_vma_alloc_or_close(struct anv_device *device,
bo->offset = anv_vma_alloc(device, bo->size + bo->_ccs_size,
align, alloc_flags, explicit_address);
if (bo->offset == 0) {
anv_bo_finish(device, bo);
anv_bo_unmap_close(device, bo);
return vk_errorf(device, VK_ERROR_OUT_OF_DEVICE_MEMORY,
"failed to allocate virtual address for BO");
}
@ -1538,6 +1551,12 @@ anv_device_alloc_bo(struct anv_device *device,
if (result != VK_SUCCESS)
return result;
if (device->kmd_backend->gem_vm_bind(device, &new_bo)) {
anv_bo_vma_free(device, &new_bo);
anv_bo_unmap_close(device, &new_bo);
return vk_errorf(device, VK_ERROR_UNKNOWN, "vm bind failed");
}
if (new_bo._ccs_size > 0) {
assert(device->info->has_aux_map);
intel_aux_map_add_mapping(device->aux_map_ctx,
@ -1793,6 +1812,12 @@ anv_device_import_bo(struct anv_device *device,
return result;
}
if (device->kmd_backend->gem_vm_bind(device, &new_bo)) {
anv_bo_vma_free(device, &new_bo);
pthread_mutex_unlock(&cache->mutex);
return vk_errorf(device, VK_ERROR_UNKNOWN, "vm bind failed");
}
*bo = new_bo;
}