anv: Implement VK_EXT_external_memory_dma_buf
This is a modified version of the patch originally sent by Chad Versace. The primary difference is that this version claims that OPQAUE_FD and DMA_BUF are compatible handle types. Reviewed-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Chad Versace <chadversary@chromium.org>
This commit is contained in:
parent
66dc618215
commit
ab18e8e59b
|
@ -1563,11 +1563,11 @@ VkResult anv_AllocateMemory(
|
||||||
* ignored.
|
* ignored.
|
||||||
*/
|
*/
|
||||||
if (fd_info && fd_info->handleType) {
|
if (fd_info && fd_info->handleType) {
|
||||||
/* At the moment, we only support the OPAQUE_FD memory type which is
|
/* At the moment, we support only the below handle types. */
|
||||||
* just a GEM buffer.
|
|
||||||
*/
|
|
||||||
assert(fd_info->handleType ==
|
assert(fd_info->handleType ==
|
||||||
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR);
|
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR ||
|
||||||
|
fd_info->handleType ==
|
||||||
|
VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT);
|
||||||
|
|
||||||
result = anv_bo_cache_import(device, &device->bo_cache,
|
result = anv_bo_cache_import(device, &device->bo_cache,
|
||||||
fd_info->fd, &mem->bo);
|
fd_info->fd, &mem->bo);
|
||||||
|
@ -1641,26 +1641,38 @@ VkResult anv_GetMemoryFdKHR(
|
||||||
|
|
||||||
assert(pGetFdInfo->sType == VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR);
|
assert(pGetFdInfo->sType == VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR);
|
||||||
|
|
||||||
/* We support only one handle type. */
|
assert(pGetFdInfo->handleType == VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR ||
|
||||||
assert(pGetFdInfo->handleType ==
|
pGetFdInfo->handleType == VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT);
|
||||||
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR);
|
|
||||||
|
|
||||||
return anv_bo_cache_export(dev, &dev->bo_cache, mem->bo, pFd);
|
return anv_bo_cache_export(dev, &dev->bo_cache, mem->bo, pFd);
|
||||||
}
|
}
|
||||||
|
|
||||||
VkResult anv_GetMemoryFdPropertiesKHR(
|
VkResult anv_GetMemoryFdPropertiesKHR(
|
||||||
VkDevice device_h,
|
VkDevice _device,
|
||||||
VkExternalMemoryHandleTypeFlagBitsKHR handleType,
|
VkExternalMemoryHandleTypeFlagBitsKHR handleType,
|
||||||
int fd,
|
int fd,
|
||||||
VkMemoryFdPropertiesKHR* pMemoryFdProperties)
|
VkMemoryFdPropertiesKHR* pMemoryFdProperties)
|
||||||
{
|
{
|
||||||
/* The valid usage section for this function says:
|
ANV_FROM_HANDLE(anv_device, device, _device);
|
||||||
*
|
struct anv_physical_device *pdevice = &device->instance->physicalDevice;
|
||||||
* "handleType must not be one of the handle types defined as opaque."
|
|
||||||
*
|
switch (handleType) {
|
||||||
* Since we only handle opaque handles for now, there are no FD properties.
|
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR:
|
||||||
*/
|
/* dma-buf can be imported as any memory type */
|
||||||
return VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR;
|
pMemoryFdProperties->memoryTypeBits =
|
||||||
|
(1 << pdevice->memory.type_count) - 1;
|
||||||
|
return VK_SUCCESS;
|
||||||
|
|
||||||
|
default:
|
||||||
|
/* The valid usage section for this function says:
|
||||||
|
*
|
||||||
|
* "handleType must not be one of the handle types defined as
|
||||||
|
* opaque."
|
||||||
|
*
|
||||||
|
* So opaque handle types fall into the default "unsupported" case.
|
||||||
|
*/
|
||||||
|
return vk_error(VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void anv_FreeMemory(
|
void anv_FreeMemory(
|
||||||
|
|
|
@ -86,6 +86,7 @@ EXTENSIONS = [
|
||||||
Extension('VK_KHR_xlib_surface', 6, 'VK_USE_PLATFORM_XLIB_KHR'),
|
Extension('VK_KHR_xlib_surface', 6, 'VK_USE_PLATFORM_XLIB_KHR'),
|
||||||
Extension('VK_KHX_multiview', 1, True),
|
Extension('VK_KHX_multiview', 1, True),
|
||||||
Extension('VK_EXT_debug_report', 8, True),
|
Extension('VK_EXT_debug_report', 8, True),
|
||||||
|
Extension('VK_EXT_external_memory_dma_buf', 1, True),
|
||||||
]
|
]
|
||||||
|
|
||||||
class VkVersion:
|
class VkVersion:
|
||||||
|
|
|
@ -866,9 +866,11 @@ static const VkExternalMemoryPropertiesKHR prime_fd_props = {
|
||||||
VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR,
|
VK_EXTERNAL_MEMORY_FEATURE_IMPORTABLE_BIT_KHR,
|
||||||
/* For the moment, let's not support mixing and matching */
|
/* For the moment, let's not support mixing and matching */
|
||||||
.exportFromImportedHandleTypes =
|
.exportFromImportedHandleTypes =
|
||||||
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR,
|
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR |
|
||||||
|
VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
|
||||||
.compatibleHandleTypes =
|
.compatibleHandleTypes =
|
||||||
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR,
|
VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR |
|
||||||
|
VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
|
||||||
};
|
};
|
||||||
|
|
||||||
VkResult anv_GetPhysicalDeviceImageFormatProperties2KHR(
|
VkResult anv_GetPhysicalDeviceImageFormatProperties2KHR(
|
||||||
|
@ -923,6 +925,7 @@ VkResult anv_GetPhysicalDeviceImageFormatProperties2KHR(
|
||||||
if (external_info && external_info->handleType != 0) {
|
if (external_info && external_info->handleType != 0) {
|
||||||
switch (external_info->handleType) {
|
switch (external_info->handleType) {
|
||||||
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR:
|
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR:
|
||||||
|
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT:
|
||||||
if (external_props)
|
if (external_props)
|
||||||
external_props->externalMemoryProperties = prime_fd_props;
|
external_props->externalMemoryProperties = prime_fd_props;
|
||||||
break;
|
break;
|
||||||
|
@ -1005,6 +1008,7 @@ void anv_GetPhysicalDeviceExternalBufferPropertiesKHR(
|
||||||
|
|
||||||
switch (pExternalBufferInfo->handleType) {
|
switch (pExternalBufferInfo->handleType) {
|
||||||
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR:
|
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT_KHR:
|
||||||
|
case VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT:
|
||||||
pExternalBufferProperties->externalMemoryProperties = prime_fd_props;
|
pExternalBufferProperties->externalMemoryProperties = prime_fd_props;
|
||||||
return;
|
return;
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue