Brad Bishop | 286d45c | 2018-10-02 15:21:57 -0400 | [diff] [blame] | 1 | From 478de18bf513ecad419d25981e7b66c78126752c Mon Sep 17 00:00:00 2001 |
| 2 | From: Madhurkiran Harikrishnan <madhurki@xilinx.com> |
| 3 | Date: Tue, 5 Dec 2017 09:58:36 -0800 |
| 4 | Subject: [PATCH 9/9] mali_memory_swap_alloc.c: Rename global_page_state with |
| 5 | global_zone_page_state |
| 6 | |
| 7 | Refer Kernel commit c41f012ade0b95b0a6e25c7150673e0554736165 |
| 8 | Which simply renames without any functional changes |
| 9 | |
| 10 | Signed-off-by: Madhurkiran Harikrishnan <madhurki@xilinx.com> |
| 11 | Upstream-Status: Pending |
| 12 | --- |
| 13 | driver/src/devicedrv/mali/linux/mali_memory_swap_alloc.c | 10 +++++++++- |
| 14 | 1 file changed, 9 insertions(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/driver/src/devicedrv/mali/linux/mali_memory_swap_alloc.c b/driver/src/devicedrv/mali/linux/mali_memory_swap_alloc.c |
| 17 | index a54faca..e122b4c 100644 |
| 18 | --- linux/mali_memory_swap_alloc.c |
| 19 | +++ b/linux/mali_memory_swap_alloc.c |
| 20 | @@ -248,7 +248,11 @@ static void mali_mem_swap_swapped_bkend_pool_shrink(_mali_mem_swap_pool_shrink_t |
| 21 | } |
| 22 | |
| 23 | /* Get system free pages number. */ |
| 24 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) |
| 25 | + system_free_size = global_zone_page_state(NR_FREE_PAGES) * PAGE_SIZE; |
| 26 | +#else |
| 27 | system_free_size = global_page_state(NR_FREE_PAGES) * PAGE_SIZE; |
| 28 | +#endif |
| 29 | last_gpu_utilization = _mali_ukk_utilization_gp_pp(); |
| 30 | |
| 31 | if ((last_gpu_utilization < gpu_utilization_threshold_value) |
| 32 | @@ -575,8 +579,12 @@ int mali_mem_swap_alloc_pages(mali_mem_swap *swap_mem, u32 size, u32 *bkend_idx) |
| 33 | |
| 34 | list_add_tail(&m_page->list, &swap_mem->pages); |
| 35 | } |
| 36 | - |
| 37 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) |
| 38 | + system_free_size = global_zone_page_state(NR_FREE_PAGES) * PAGE_SIZE; |
| 39 | +#else |
| 40 | system_free_size = global_page_state(NR_FREE_PAGES) * PAGE_SIZE; |
| 41 | +#endif |
| 42 | + |
| 43 | |
| 44 | if ((system_free_size < mali_mem_swap_out_threshold_value) |
| 45 | && (mem_backend_swapped_pool_size > (mali_mem_swap_out_threshold_value >> 2)) |
| 46 | -- |
| 47 | 2.7.4 |
| 48 | |