fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-29 01:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

venus: handle device memory report requests

Browse source 
Signed-off-by: Yiwei Zhang <zzyiwei@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23411>
This commit is contained in:
Yiwei Zhang 2023-06-01 15:59:34 -07:00 • committed by Marge Bot
parent 26567183d8
commit f70a08bc60
2 changed files with 64 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
src/virtio/vulkan/vn_device.c
View file

@ -167,6 +167,54 @@ vn_device_queue_family_fini(struct vn_device *dev)
vk_free(&dev->base.base.alloc, dev->queue_families);
}
static VkResult
vn_device_memory_report_init(struct vn_device *dev,
const VkDeviceCreateInfo *create_info)
{
const struct vk_features *app_feats = &dev->base.base.enabled_features;
if (!app_feats->deviceMemoryReport)
return VK_SUCCESS;
uint32_t count = 0;
vk_foreach_struct_const(pnext, create_info->pNext) {
if (pnext->sType ==
VK_STRUCTURE_TYPE_DEVICE_DEVICE_MEMORY_REPORT_CREATE_INFO_EXT)
count++;
}
struct vn_device_memory_report *mem_reports = NULL;
if (count) {
mem_reports =
vk_alloc(&dev->base.base.alloc, sizeof(*mem_reports) * count,
VN_DEFAULT_ALIGN, VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
if (!mem_reports)
return VK_ERROR_OUT_OF_HOST_MEMORY;
}
count = 0;
vk_foreach_struct_const(pnext, create_info->pNext) {
if (pnext->sType ==
VK_STRUCTURE_TYPE_DEVICE_DEVICE_MEMORY_REPORT_CREATE_INFO_EXT) {
const struct VkDeviceDeviceMemoryReportCreateInfoEXT *report =
(void *)pnext;
mem_reports[count].callback = report->pfnUserCallback;
mem_reports[count].data = report->pUserData;
count++;
}
}
dev->memory_report_count = count;
dev->memory_reports = mem_reports;
return VK_SUCCESS;
}
static inline void
vn_device_memory_report_fini(struct vn_device *dev)
{
vk_free(&dev->base.base.alloc, dev->memory_reports);
}
static bool
find_extension_names(const char *const *exts,
uint32_t ext_count,
@ -420,9 +468,13 @@ vn_device_init(struct vn_device *dev,
if (result != VK_SUCCESS)
return result;
result = vn_device_memory_report_init(dev, create_info);
if (result != VK_SUCCESS)
goto out_destroy_device;
if (!vn_device_queue_family_init(dev, create_info)) {
result = VK_ERROR_OUT_OF_HOST_MEMORY;
goto out_destroy_device;
goto out_memory_report_fini;
}
for (uint32_t i = 0; i < ARRAY_SIZE(dev->memory_pools); i++) {
@ -468,6 +520,9 @@ out_memory_pool_fini:
vn_device_queue_family_fini(dev);
out_memory_report_fini:
vn_device_memory_report_fini(dev);
out_destroy_device:
vn_call_vkDestroyDevice(instance, dev_handle, NULL);

8
src/virtio/vulkan/vn_device.h
View file

@ -17,6 +17,11 @@
#include "vn_device_memory.h"
#include "vn_feedback.h"
struct vn_device_memory_report {
PFN_vkDeviceMemoryReportCallbackEXT callback;
void *data;
};
struct vn_device {
struct vn_device_base base;
@ -24,6 +29,9 @@ struct vn_device {
struct vn_physical_device *physical_device;
struct vn_renderer *renderer;
struct vn_device_memory_report *memory_reports;
uint32_t memory_report_count;
/* unique queue family indices in which to create the device queues */
uint32_t *queue_families;
uint32_t queue_family_count;