shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

MALI: utgard: RK: use '__GFP_ZERO | GFP_HIGHUSER' as 'flags' of alloc_page()

Browse Source 
Just the same as in Midgard device driver.
This could resolve Defect #170228 and #184427 in RK redmine.

In addition, add err log for the case that alloc_page() returns NULL.

Change-Id: Ie1ddfae9429236900e4308e2cfecec2cd75a183a
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
This commit is contained in:
Zhen Chen
2018-09-10 16:10:43 +08:00
committed by Tao Huang
parent e9466ededd
commit e705e67167
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/arm/mali400/mali/linux/mali_memory_os_alloc.c
View File

@@ -8,6 +8,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "../platform/rk/custom_log.h"
#include <linux/list.h>
#include <linux/mm.h>
#include <linux/mm_types.h>
@@ -200,7 +202,7 @@ int mali_mem_os_alloc_pages(mali_mem_os_mem *os_mem, u32 size)
/* Allocate new pages, if needed. */
for (i = 0; i < remaining; i++) {
dma_addr_t dma_addr;
gfp_t flags = __GFP_ZERO | __GFP_REPEAT | __GFP_NOWARN | __GFP_COLD;
gfp_t flags = __GFP_ZERO | GFP_HIGHUSER;
int err;
#if defined(CONFIG_ARM) && !defined(CONFIG_ARM_LPAE)
@@ -210,7 +212,6 @@ int mali_mem_os_alloc_pages(mali_mem_os_mem *os_mem, u32 size)
flags |= GFP_DMA32;
#else
#ifdef CONFIG_ZONE_DMA
flags |= GFP_DMA;
#else
/* arm64 utgard only work on < 4G, but the kernel
* didn't provide method to allocte memory < 4G
@@ -223,6 +224,7 @@ int mali_mem_os_alloc_pages(mali_mem_os_mem *os_mem, u32 size)
new_page = alloc_page(flags);
if (unlikely(NULL == new_page)) {
E("err.");
/* Calculate the number of pages actually allocated, and free them. */
os_mem->count = (page_count - remaining) + i;
atomic_add(os_mem->count, &mali_mem_os_allocator.allocated_pages);