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

tu: Fix heap size

Browse Source 
It make no sense to advertise a bigger heap than what we can fit into
the GPU virtual address space.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25130>
This commit is contained in:
Rob Clark
2023-09-08 14:24:48 -07:00
committed by Marge Bot
parent c4c76b72e1
commit b235e8fc9a
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/freedreno/vulkan/tu_device.cc
+7 -1
View File
@@ -1479,7 +1479,7 @@ tu_GetPhysicalDeviceQueueFamilyProperties2(
}
uint64_t
tu_get_system_heap_size()
tu_get_system_heap_size(struct tu_physical_device *physical_device)
{
struct sysinfo info;
sysinfo(&info);
@@ -1495,6 +1495,9 @@ tu_get_system_heap_size()
else
available_ram = total_ram * 3 / 4;
if (physical_device->va_size)
available_ram = MIN2(available_ram, physical_device->va_size);
return available_ram;
}
@@ -1508,6 +1511,9 @@ tu_get_budget_memory(struct tu_physical_device *physical_device)
os_get_available_system_memory(&sys_available);
assert(has_available_memory);
if (physical_device->va_size)
sys_available = MIN2(sys_available, physical_device->va_size);
/*
* Let's not incite the app to starve the system: report at most 90% of
* available system memory.
src/freedreno/vulkan/tu_device.h
+1 -1
View File
@@ -457,7 +457,7 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(tu_sampler, base, VkSampler,
VK_OBJECT_TYPE_SAMPLER)
uint64_t
tu_get_system_heap_size(void);
tu_get_system_heap_size(struct tu_physical_device *physical_device);
VkResult
tu_physical_device_init(struct tu_physical_device *device,
src/freedreno/vulkan/tu_knl_drm_msm.cc
+1 -1
View File
@@ -1113,7 +1113,7 @@ tu_knl_drm_msm_load(struct tu_instance *instance,
device->sync_types[1] = &device->timeline_type.sync;
device->sync_types[2] = NULL;
device->heap.size = tu_get_system_heap_size();
device->heap.size = tu_get_system_heap_size(device);
device->heap.used = 0u;
device->heap.flags = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT;
src/freedreno/vulkan/tu_knl_drm_virtio.cc
+1 -1
View File
@@ -1591,7 +1591,7 @@ tu_knl_drm_virtio_load(struct tu_instance *instance,
device->sync_types[1] = &device->timeline_type.sync;
device->sync_types[2] = NULL;
device->heap.size = tu_get_system_heap_size();
device->heap.size = tu_get_system_heap_size(device);
device->heap.used = 0u;
device->heap.flags = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT;
src/freedreno/vulkan/tu_knl_kgsl.cc
+1 -1
View File
@@ -1271,7 +1271,7 @@ tu_knl_kgsl_load(struct tu_instance *instance, int fd)
device->sync_types[1] = &device->timeline_type.sync;
device->sync_types[2] = NULL;
device->heap.size = tu_get_system_heap_size();
device->heap.size = tu_get_system_heap_size(device);
device->heap.used = 0u;
device->heap.flags = VK_MEMORY_HEAP_DEVICE_LOCAL_BIT;