anv: Rework the internal BO allocation API

This makes a number of changes to the current API:

 1. Everything is renamed to anv_device_* instead of anv_bo_cache_*
    because the BO cache is soon going to be the sole BO allocation path
    and not some special case to make import/export work.

 2. Drop the cache parameter.  It's totally redundant with the device
    and just annoying to keep typing.

 3. Rework flags so that they go the convenient direction for usage in
    ANV rather than whichever awkward way the i915 specified it to
    maintain backwards compatibility.  This also gives us the
    opportunity to set some defaults.

 4. Add flags for mapping and coherency.

Reviewed-by: Lionel Landwerlin <[email protected]>

1 files changed, 11 insertions, 10 deletions

diff --git a/src/intel/vulkan/anv_queue.c b/src/intel/vulkan/anv_queue.c
index 5aa0f100900..bee92168e90 100644
--- a/src/intel/vulkan/anv_queue.c
+++ b/src/intel/vulkan/anv_queue.c
@@ -951,10 +951,10 @@ VkResult anv_CreateSemaphore(
          }
       } else {
          semaphore->permanent.type = ANV_SEMAPHORE_TYPE_BO;
-         VkResult result = anv_bo_cache_alloc(device, &device->bo_cache,
-                                              4096, 0 /* flags */,
-                                              true /* is_external */,
-                                              &semaphore->permanent.bo);
+         VkResult result = anv_device_alloc_bo(device, 4096,
+                                               ANV_BO_ALLOC_EXTERNAL |
+                                               ANV_BO_ALLOC_IMPLICIT_SYNC,
+                                               &semaphore->permanent.bo);
          if (result != VK_SUCCESS) {
             vk_free2(&device->alloc, pAllocator, semaphore);
             return result;
@@ -998,7 +998,7 @@ anv_semaphore_impl_cleanup(struct anv_device *device,
       break;
 
    case ANV_SEMAPHORE_TYPE_BO:
-      anv_bo_cache_release(device, &device->bo_cache, impl->bo);
+      anv_device_release_bo(device, impl->bo);
       break;
 
    case ANV_SEMAPHORE_TYPE_SYNC_FILE:
@@ -1106,14 +1106,15 @@ VkResult anv_ImportSemaphoreFdKHR(
       } else {
          new_impl.type = ANV_SEMAPHORE_TYPE_BO;
 
-         VkResult result = anv_bo_cache_import(device, &device->bo_cache,
-                                               fd, 0 /* flags */,
-                                               &new_impl.bo);
+         VkResult result = anv_device_import_bo(device, fd,
+                                                ANV_BO_ALLOC_EXTERNAL |
+                                                ANV_BO_ALLOC_IMPLICIT_SYNC,
+                                                &new_impl.bo);
          if (result != VK_SUCCESS)
             return result;
 
          if (new_impl.bo->size < 4096) {
-            anv_bo_cache_release(device, &device->bo_cache, new_impl.bo);
+            anv_device_release_bo(device, new_impl.bo);
             return vk_error(VK_ERROR_INVALID_EXTERNAL_HANDLE);
          }
 
@@ -1195,7 +1196,7 @@ VkResult anv_GetSemaphoreFdKHR(
 
    switch (impl->type) {
    case ANV_SEMAPHORE_TYPE_BO:
-      result = anv_bo_cache_export(device, &device->bo_cache, impl->bo, pFd);
+      result = anv_device_export_bo(device, impl->bo, pFd);
       if (result != VK_SUCCESS)
          return result;
       break;