OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Use the new BO alloc API for Android

Browse Source 
Fixes: a44f5ee0d8 "anv: Rework the internal BO allocation API"
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Jason Ekstrand
2019-10-31 10:28:05 -05:00
parent b7674829a1
commit 02d9403067
1 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/intel/vulkan/anv_android.c
View File

@@ -307,14 +307,7 @@ anv_import_ahw_memory(VkDevice device_h,
if (dma_buf < 0) if (dma_buf < 0)
return VK_ERROR_INVALID_EXTERNAL_HANDLE; return VK_ERROR_INVALID_EXTERNAL_HANDLE;
uint64_t bo_flags = ANV_BO_EXTERNAL; VkResult result = anv_device_import_bo(device, dma_buf, 0, &mem->bo);
if (device->instance->physicalDevice.supports_48bit_addresses)
bo_flags |= EXEC_OBJECT_SUPPORTS_48B_ADDRESS;
if (device->instance->physicalDevice.use_softpin)
bo_flags |= EXEC_OBJECT_PINNED;
VkResult result = anv_bo_cache_import(device, &device->bo_cache,
dma_buf, bo_flags, &mem->bo);
assert(VK_SUCCESS); assert(VK_SUCCESS);
/* "If the vkAllocateMemory command succeeds, the implementation must /* "If the vkAllocateMemory command succeeds, the implementation must
@@ -463,13 +456,19 @@ anv_image_from_gralloc(VkDevice device_h,
*/ */
int dma_buf = gralloc_info->handle->data[0]; int dma_buf = gralloc_info->handle->data[0];
uint64_t bo_flags = ANV_BO_EXTERNAL; /* We need to set the WRITE flag on window system buffers so that GEM will
if (device->instance->physicalDevice.supports_48bit_addresses) * know we're writing to them and synchronize uses on other rings (for
bo_flags |= EXEC_OBJECT_SUPPORTS_48B_ADDRESS; * example, if the display server uses the blitter ring).
if (device->instance->physicalDevice.use_softpin) *
bo_flags |= EXEC_OBJECT_PINNED; * If this function fails and if the imported bo was resident in the cache,
* we should avoid updating the bo's flags. Therefore, we defer updating
result = anv_bo_cache_import(device, &device->bo_cache, dma_buf, bo_flags, &bo); * the flags until success is certain.
*
*/
result = anv_device_import_bo(device, dma_buf,
ANV_BO_ALLOC_IMPLICIT_SYNC |
ANV_BO_ALLOC_IMPLICIT_WRITE,
&bo);
if (result != VK_SUCCESS) { if (result != VK_SUCCESS) {
return vk_errorf(device->instance, device, result, return vk_errorf(device->instance, device, result,
"failed to import dma-buf from VkNativeBufferANDROID"); "failed to import dma-buf from VkNativeBufferANDROID");
@@ -529,18 +528,6 @@ anv_image_from_gralloc(VkDevice device_h,
image->planes[0].address.bo = bo; image->planes[0].address.bo = bo;
image->planes[0].bo_is_owned = true; image->planes[0].bo_is_owned = true;
/* We need to set the WRITE flag on window system buffers so that GEM will
* know we're writing to them and synchronize uses on other rings (for
* example, if the display server uses the blitter ring).
*
* If this function fails and if the imported bo was resident in the cache,
* we should avoid updating the bo's flags. Therefore, we defer updating
* the flags until success is certain.
*
*/
bo->flags &= ~EXEC_OBJECT_ASYNC;
bo->flags |= EXEC_OBJECT_WRITE;
/* Don't clobber the out-parameter until success is certain. */ /* Don't clobber the out-parameter until success is certain. */
*out_image_h = image_h; *out_image_h = image_h;
@@ -550,7 +537,7 @@ anv_image_from_gralloc(VkDevice device_h,
anv_DestroyImage(device_h, image_h, alloc); anv_DestroyImage(device_h, image_h, alloc);
fail_create: fail_create:
fail_tiling: fail_tiling:
anv_bo_cache_release(device, &device->bo_cache, bo); anv_device_release_bo(device, bo);
return result; return result;
} }