diff options
| author | Sidath Senanayake <sidaths@google.com> | 2021-01-29 15:03:53 +0000 |
|---|---|---|
| committer | Sidath Senanayake <sidaths@google.com> | 2021-01-29 15:03:53 +0000 |
| commit | 9748305a584b9f1f7705303ce6e33a5e8b923e60 (patch) | |
| tree | a73788e1d912a3202db3a99018002e0858e9a948 /mali_kbase/mali_kbase_mem_pool.c | |
| parent | 201c8bfb4637601363b6e9283f3bdc510711a226 (diff) | |
| download | gpu-9748305a584b9f1f7705303ce6e33a5e8b923e60.tar.gz | |
Mali Valhall DDK r29p0 KMD
Provenance:
afaca8da1 (collaborate/EAC/v_r29p0)
VX504X08X-BU-00000-r29p0-01eac0 - Valhall Android DDK
VX504X08X-BU-60000-r29p0-01eac0 - Valhall Android Document Bundle
VX504X08X-DC-11001-r29p0-01eac0 - Valhall Android DDK Software Errata
VX504X08X-SW-99006-r29p0-01eac0 - Valhall Android Renderscript AOSP parts
Signed-off-by: Sidath Senanayake <sidaths@google.com>
Change-Id: Ie0904c9223b7ec9311b848a52d3159ac2b07530e
Diffstat (limited to 'mali_kbase/mali_kbase_mem_pool.c')
| -rw-r--r-- | mali_kbase/mali_kbase_mem_pool.c | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/mali_kbase/mali_kbase_mem_pool.c b/mali_kbase/mali_kbase_mem_pool.c index 0723e32..c075727 100644 --- a/mali_kbase/mali_kbase_mem_pool.c +++ b/mali_kbase/mali_kbase_mem_pool.c @@ -1,6 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 /* * - * (C) COPYRIGHT 2015-2019 ARM Limited. All rights reserved. + * (C) COPYRIGHT 2015-2020 ARM Limited. All rights reserved. * * This program is free software and is provided to you under the terms of the * GNU General Public License version 2 as published by the Free Software @@ -154,20 +155,12 @@ static void kbase_mem_pool_spill(struct kbase_mem_pool *next_pool, struct page *kbase_mem_alloc_page(struct kbase_mem_pool *pool) { struct page *p; - gfp_t gfp; + gfp_t gfp = GFP_HIGHUSER | __GFP_ZERO; struct kbase_device *const kbdev = pool->kbdev; struct device *const dev = kbdev->dev; dma_addr_t dma_addr; int i; -#if defined(CONFIG_ARM) && !defined(CONFIG_HAVE_DMA_ATTRS) && \ - LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) - /* DMA cache sync fails for HIGHMEM before 3.5 on ARM */ - gfp = GFP_USER | __GFP_ZERO; -#else - gfp = GFP_HIGHUSER | __GFP_ZERO; -#endif - /* don't warn on higher order failures */ if (pool->order) gfp |= __GFP_NOWARN; @@ -364,17 +357,6 @@ static unsigned long kbase_mem_pool_reclaim_scan_objects(struct shrinker *s, return freed; } -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) -static int kbase_mem_pool_reclaim_shrink(struct shrinker *s, - struct shrink_control *sc) -{ - if (sc->nr_to_scan == 0) - return kbase_mem_pool_reclaim_count_objects(s, sc); - - return kbase_mem_pool_reclaim_scan_objects(s, sc); -} -#endif - int kbase_mem_pool_init(struct kbase_mem_pool *pool, const struct kbase_mem_pool_config *config, unsigned int order, @@ -398,19 +380,13 @@ int kbase_mem_pool_init(struct kbase_mem_pool *pool, spin_lock_init(&pool->pool_lock); INIT_LIST_HEAD(&pool->page_list); - /* Register shrinker */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 12, 0) - pool->reclaim.shrink = kbase_mem_pool_reclaim_shrink; -#else pool->reclaim.count_objects = kbase_mem_pool_reclaim_count_objects; pool->reclaim.scan_objects = kbase_mem_pool_reclaim_scan_objects; -#endif pool->reclaim.seeks = DEFAULT_SEEKS; /* Kernel versions prior to 3.1 : - * struct shrinker does not define batch */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) + * struct shrinker does not define batch + */ pool->reclaim.batch = 0; -#endif register_shrinker(&pool->reclaim); pool_dbg(pool, "initialized\n"); |