AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gfxstream: Add init+tracking for the host-equivalent queue_family

Browse Source 
information

This information (otherwise invisible to the guest) may be used in the
future in some other guest-only functionality

Reviewed-by: Gurchetan Singh <gurchetansingh@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36330>
This commit is contained in:
Aaron Ruby
2025-07-23 14:21:13 -04:00
committed by Marge Bot
parent 89ccc8ba2b
commit 49ec8bc982
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gfxstream/guest/vulkan/gfxstream_vk_device.cpp
View File

@@ -519,6 +519,40 @@ static VkResult gfxstream_vk_device_init_queues(struct gfxstream_vk_device* dev,
return VK_SUCCESS;
}
static VkResult gfxstream_vk_device_queue_family_init(struct gfxstream_vk_device* dev,
const VkDeviceCreateInfo* create_info) {
const VkAllocationCallbacks* alloc = &dev->vk.alloc;
uint32_t* queue_families = NULL;
uint32_t count = 0;
queue_families =
(uint32_t*)vk_zalloc(alloc, sizeof(*queue_families) * create_info->queueCreateInfoCount,
GFXSTREAM_DEFAULT_ALIGN, VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
if (!queue_families) return VK_ERROR_OUT_OF_HOST_MEMORY;
for (uint32_t i = 0; i < create_info->queueCreateInfoCount; i++) {
const uint32_t index = create_info->pQueueCreateInfos[i].queueFamilyIndex;
bool new_index = true;
for (uint32_t j = 0; j < count; j++) {
if (queue_families[j] == index) {
new_index = false;
break;
}
}
if (new_index) queue_families[count++] = index;
}
dev->queue_families = queue_families;
dev->queue_family_count = count;
return VK_SUCCESS;
}
static inline void gfxstream_vk_device_queue_family_fini(struct gfxstream_vk_device* dev) {
vk_free(&dev->vk.alloc, dev->queue_families);
}
VkResult gfxstream_vk_CreateDevice(VkPhysicalDevice physicalDevice,
const VkDeviceCreateInfo* pCreateInfo,
const VkAllocationCallbacks* pAllocator, VkDevice* pDevice) {
@@ -612,6 +646,9 @@ VkResult gfxstream_vk_CreateDevice(VkPhysicalDevice physicalDevice,
vk_free(pMesaAllocator, gfxstream_device);
}
if (result == VK_SUCCESS) {
result = gfxstream_vk_device_queue_family_init(gfxstream_device, pCreateInfo);
}
if (result == VK_SUCCESS) {
result = gfxstream_vk_device_init_queues(gfxstream_device, pCreateInfo);
}
@@ -629,6 +666,8 @@ void gfxstream_vk_DestroyDevice(VkDevice device, const VkAllocationCallbacks* pA
for (uint32_t i = 0; i < gfxstream_device->queue_count; i++)
gfxstream_vk_queue_fini(&gfxstream_device->queues[i]);
gfxstream_vk_device_queue_family_fini(gfxstream_device);
auto vkEnc = gfxstream::vk::ResourceTracker::getThreadLocalEncoder();
vkEnc->vkDestroyDevice(gfxstream_device->internal_object, pAllocator, true /* do lock */);

4
src/gfxstream/guest/vulkan_enc/gfxstream_vk_private.h
View File

@@ -82,6 +82,10 @@ struct gfxstream_vk_device {
struct vk_device_dispatch_table cmd_dispatch;
struct gfxstream_vk_physical_device* physical_device;
/* unique queue family indices in which to create the device queues */
uint32_t* queue_families;
uint32_t queue_family_count;
struct gfxstream_vk_queue* queues;
uint32_t queue_count;