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

vulkan: Query memory requirements in vk_android_import_anb_memory

Browse source 
Based on 752ea7f6df ("panvk: resolve ANB (pre spec v8)").

Replace the hardcoded memoryTypeIndex 0 and lseek-based allocationSize
with proper GetImageMemoryRequirements and GetMemoryFdPropertiesKHR
queries.

Also fix a missing error check on os_dupfd_cloexec().

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40635>
This commit is contained in:
Valentine Burley 2026-03-25 14:31:02 +01:00 • committed by Marge Bot
parent e0965d82b7
commit 5fb560688b
1 changed files with 31 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/vulkan/runtime/vk_android.c
View file

@ -197,6 +197,32 @@ vk_android_import_anb_memory(struct vk_device *device,
{
assert(anb && anb->handle && anb->handle->numFds > 0);
int dma_buf_fd = anb->handle->data[0];
/* Query image memory requirements for size and supported memory types */
VkMemoryRequirements mem_reqs;
device->dispatch_table.GetImageMemoryRequirements(
(VkDevice)device, (VkImage)image, &mem_reqs);
VkMemoryFdPropertiesKHR fd_props = {
.sType = VK_STRUCTURE_TYPE_MEMORY_FD_PROPERTIES_KHR,
};
VkResult result = device->dispatch_table.GetMemoryFdPropertiesKHR(
(VkDevice)device, VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
dma_buf_fd, &fd_props);
if (result != VK_SUCCESS)
return result;
uint32_t compatible_types = mem_reqs.memoryTypeBits & fd_props.memoryTypeBits;
if (!compatible_types)
return VK_ERROR_INVALID_EXTERNAL_HANDLE;
int dup_fd = os_dupfd_cloexec(dma_buf_fd);
if (dup_fd < 0) {
return (errno == EMFILE) ? VK_ERROR_TOO_MANY_OBJECTS
: VK_ERROR_OUT_OF_HOST_MEMORY;
}
const VkMemoryDedicatedAllocateInfo ded_alloc = {
.sType = VK_STRUCTURE_TYPE_MEMORY_DEDICATED_ALLOCATE_INFO,
.pNext = NULL,
@ -207,18 +233,18 @@ vk_android_import_anb_memory(struct vk_device *device,
.sType = VK_STRUCTURE_TYPE_IMPORT_MEMORY_FD_INFO_KHR,
.pNext = &ded_alloc,
.handleType = VK_EXTERNAL_MEMORY_HANDLE_TYPE_DMA_BUF_BIT_EXT,
.fd = os_dupfd_cloexec(anb->handle->data[0]),
.fd = dup_fd,
};
const VkMemoryAllocateInfo alloc_info = {
.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO,
.pNext = &import_info,
.allocationSize = lseek(import_info.fd, 0, SEEK_END),
.memoryTypeIndex = 0,
.allocationSize = mem_reqs.size,
.memoryTypeIndex = ffs(compatible_types) - 1,
};
VkResult result = device->dispatch_table.AllocateMemory(
result = device->dispatch_table.AllocateMemory(
(VkDevice)device, &alloc_info, alloc, &image->anb_memory);
if (result != VK_SUCCESS) {
close(import_info.fd);
close(dup_fd);
return result;
}