From 5b1ed09ff023ff98fed0c78a5ea609821cb92a8c Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Fri, 6 Dec 2019 01:07:56 +1100 Subject: [PATCH] anv: use os_get_available_system_memory() Replace local get_available_system_memory() function with os_get_available_system_memory(). Fixes: b80930a6fea ("anv: add support for VK_EXT_memory_budget") Signed-off-by: Jonathan Gray Reviewed-by: Jason Ekstrand Part-of: --- src/intel/vulkan/anv_device.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index f670be5cc5c..7470d0cf17f 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -308,29 +308,6 @@ anv_physical_device_free_disk_cache(struct anv_physical_device *device) #endif } -static uint64_t -get_available_system_memory() -{ - char *meminfo = os_read_file("/proc/meminfo", NULL); - if (!meminfo) - return 0; - - char *str = strstr(meminfo, "MemAvailable:"); - if (!str) { - free(meminfo); - return 0; - } - - uint64_t kb_mem_available; - if (sscanf(str, "MemAvailable: %" PRIx64, &kb_mem_available) == 1) { - free(meminfo); - return kb_mem_available << 10; - } - - free(meminfo); - return 0; -} - static VkResult anv_physical_device_try_create(struct anv_instance *instance, drmDevicePtr drm_device, @@ -495,7 +472,8 @@ anv_physical_device_try_create(struct anv_instance *instance, device->has_reg_timestamp = anv_gem_reg_read(fd, TIMESTAMP | I915_REG_READ_8B_WA, &u64_ignore) == 0; - device->has_mem_available = get_available_system_memory() != 0; + uint64_t avail_mem; + device->has_mem_available = os_get_available_system_memory(&avail_mem); device->always_flush_cache = driQueryOptionb(&instance->dri_options, "always_flush_cache"); @@ -2240,8 +2218,10 @@ anv_get_memory_budget(VkPhysicalDevice physicalDevice, VkPhysicalDeviceMemoryBudgetPropertiesEXT *memoryBudget) { ANV_FROM_HANDLE(anv_physical_device, device, physicalDevice); - uint64_t sys_available = get_available_system_memory(); - assert(sys_available > 0); + uint64_t sys_available; + ASSERTED bool has_available_memory = + os_get_available_system_memory(&sys_available); + assert(has_available_memory); VkDeviceSize total_heaps_size = 0; for (size_t i = 0; i < device->memory.heap_count; i++) -- 2.30.2