<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Mon, Mar 6, 2017 at 12:40 PM, Chad Versace <<a href="mailto:chadversary@chromium.org" target="_blank">chadversary@chromium.org</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">For now, we support dma_bufs only for VkBuffers.Â The VK_MESAX_external_memory_dma_buf spec allows us to support dma_buf VkImages, but we choose to defer that support until VK_MESAX_external_image_dma_buf. --- Â src/intel/vulkan/anv_device.cÂ Â Â Â Â Â | 28 +++++++++++++++++++--------- Â src/intel/vulkan/anv_entrypoints_gen.py |Â 1 + Â src/intel/vulkan/anv_formats.cÂ Â Â Â Â | 22 +++++++++++++++++++--- Â src/intel/vulkan/anv_private.hÂ Â Â Â Â |Â 4 ++++ Â 4 files changed, 43 insertions(+), 12 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 1374118c83f..cc5f57b0f86 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -322,6 +322,10 @@ static const VkExtensionProperties device_extensions[] = { Â Â Â Â .extensionName = VK_KHX_EXTERNAL_MEMORY_FD_EXTENSION_NAME, Â Â Â Â .specVersion = 1, Â Â }, +Â Â { +Â Â Â .extensionName = VK_MESAX_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME, +Â Â Â .specVersion = 0, +Â Â }, Â }; Â static void * @@ -1398,11 +1402,7 @@ VkResult anv_AllocateMemory( Â Â Â * ignored. Â Â Â */ Â Â if (fd_info && fd_info->handleType) { -Â Â Â /* At the moment, we only support the OPAQUE_FD memory type which is -Â Â Â Â * just a GEM buffer. -Â Â Â Â */ -Â Â Â assert(fd_info->handleType == -Â Â Â Â Â Â Â VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHX); +Â Â Â assert((fd_info->handleType & ~ANV_SUPPORTED_MEMORY_HANDLE_TYPES) == 0); Â Â Â Â uint32_t gem_handle = anv_gem_fd_to_handle(device, fd_info->fd); Â Â Â Â if (!gem_handle) { @@ -1450,8 +1450,7 @@ VkResult anv_GetMemoryFdKHX( Â Â ANV_FROM_HANDLE(anv_device, dev, device_h); Â Â ANV_FROM_HANDLE(anv_device_memory, mem, memory_h); -Â Â /* We support only one handle type. */ -Â Â assert(handleType == VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHX); +Â Â assert((handleType & ~ANV_SUPPORTED_MEMORY_HANDLE_TYPES) == 0); Â Â int fd = anv_gem_handle_to_fd(dev, mem->bo.gem_handle); Â Â if (fd == -1) @@ -1468,13 +1467,24 @@ VkResult anv_GetMemoryFdPropertiesKHX( Â Â Â intÂ Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â fd, Â Â Â VkMemoryFdPropertiesKHX*Â Â Â Â Â Â Â Â Â Â pMemoryFdProperties) Â { +Â Â ANV_FROM_HANDLE(anv_device, device, device_h); + +Â Â if (fd == -1) +Â Â Â return VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX; + Â Â /* The valid usage section for this function says: Â Â Â * Â Â Â *Â Â "handleType must not be one of the handle types defined as opaque." Â Â Â * -Â Â * Since we only handle opaque handles for now, there are no FD properties. +Â Â * The only non-opaque fd type we support is dma_buf. Â Â Â */ -Â Â return VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX; +Â Â if (handleType != VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_MESAX) +Â Â Â return VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX; + +Â Â /* We support exactly one memory type on LLC, two on non-LLC.Â */ +Â Â pMemoryFdProperties->memoryTypeBits = device->info.has_llc ? 1 : 3; + +Â Â return VK_SUCCESS; Â } Â void anv_FreeMemory( diff --git a/src/intel/vulkan/anv_entrypoints_gen.py b/src/intel/vulkan/anv_entrypoints_gen.py index eb960b45986..7ba070be5e4 100644 --- a/src/intel/vulkan/anv_entrypoints_gen.py +++ b/src/intel/vulkan/anv_entrypoints_gen.py @@ -43,6 +43,7 @@ supported_extensions = [ Â Â 'VK_KHX_external_memory', Â Â 'VK_KHX_external_memory_capabilities', Â Â 'VK_KHX_external_memory_fd', +Â Â 'VK_MESAX_external_memory_dma_buf', Â ] Â # We generate a static hash table for entry point lookup diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c index eade36eaf6f..cbbbd0bc0d8 100644 --- a/src/intel/vulkan/anv_formats.c +++ b/src/intel/vulkan/anv_formats.c @@ -663,7 +663,7 @@ VkResult anv_GetPhysicalDeviceImageFormatProperties( Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â pImageFormatProperties); Â } -static const VkExternalMemoryPropertiesKHX prime_fd_props = { +static const VkExternalMemoryPropertiesKHX opaque_fd_props = { Â Â /* If we can handle external, then we can both import and export it. */ Â Â .externalMemoryFeatures = VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_KHX | Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHX, @@ -674,6 +674,17 @@ static const VkExternalMemoryPropertiesKHX prime_fd_props = { Â Â Â Â VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHX, Â }; +static const VkExternalMemoryPropertiesKHX dma_buf_mem_props = { +Â Â /* If we can handle external, then we can both import and export it. */ +Â Â .externalMemoryFeatures = VK_EXTERNAL_MEMORY_FEATURE_EXPORTABLE_BIT_KHX | +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHX, +Â Â /* For the moment, let's not support mixing and matching */ +Â Â .exportFromImportedHandleTypes = +Â Â Â VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_MESAX, +Â Â .compatibleHandleTypes = +Â Â Â VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_MESAX, +}; </blockquote><div> </div><div>These two can import/export to/from each other just fine.Â I don't see why we need to separate them. </div><div>Â </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> + Â VkResult anv_GetPhysicalDeviceImageFormatProperties2KHR( Â Â Â VkPhysicalDeviceÂ Â Â Â Â Â Â Â Â Â Â Â Â Â physicalDevice, Â Â Â const VkPhysicalDeviceImageFormatInfo2KHR*Â base_info, @@ -722,8 +733,10 @@ VkResult anv_GetPhysicalDeviceImageFormatProperties2KHR( Â Â if (external_info && external_info->handleType != 0) { Â Â Â Â switch (external_info->handleType) { Â Â Â Â case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHX: -Â Â Â Â Â external_props->externalMemoryProperties = prime_fd_props; +Â Â Â Â Â external_props->externalMemoryProperties = opaque_fd_props; Â Â Â Â Â break; +Â Â Â case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_MESAX: +Â Â Â Â Â /* Fallthrough. We support dma_buf for VkBuffer but not yet VkImage. */ Â Â Â Â default: Â Â Â Â Â /* From the Vulkan 1.0.42 spec: Â Â Â Â Â Â * @@ -802,7 +815,10 @@ void anv_GetPhysicalDeviceExternalBufferPropertiesKHX( Â Â switch (pExternalBufferInfo->handleType) { Â Â case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHX: -Â Â Â pExternalBufferProperties->externalMemoryProperties = prime_fd_props; +Â Â Â pExternalBufferProperties->externalMemoryProperties = opaque_fd_props; +Â Â Â return; +Â Â case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_MESAX: +Â Â Â pExternalBufferProperties->externalMemoryProperties = dma_buf_mem_props; Â Â Â Â return; Â Â default: Â Â Â Â goto unsupported; diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 01aeb216597..ac922e7cfc6 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -834,6 +834,10 @@ struct anv_device_memory { Â Â void *Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â map; Â }; +#define ANV_SUPPORTED_MEMORY_HANDLE_TYPES \ +Â Â (VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHX | \ +Â Â VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_MESAX) + Â /** Â * Header for Vertex URB Entry (VUE) Â */ -- 2.12.0 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div></div>