redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

MGS-5283 [#imx-1238] fix GPU memory without CMA 

Fix GPU memory problem when disable CMA allocator,
set LINUX_CMA_FSL=0 in gc_hal_kernel_platform_imx.config

Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
5.4-rM2-2.2.x-imx-squashed
Xianzhong 2019-10-29 00:19:05 +08:00 committed by Dong Aisheng
parent 3c6cb83114
commit f79ac90c9a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_os.c
View File

@ -1378,7 +1378,11 @@ gckOS_AllocateNonPagedMemory(
Flag &= ~gcvALLOC_FLAG_CACHEABLE;
#endif
#if LINUX_CMA_FSL
Flag |= gcvALLOC_FLAG_CMA_PREEMPT;
#else
Flag |= gcvALLOC_FLAG_4GB_ADDR | gcvALLOC_FLAG_CONTIGUOUS;
#endif
/* Walk all allocators. */
list_for_each_entry(allocator, &Os->allocatorList, link)
@ -3121,7 +3125,8 @@ gckOS_AllocatePagedMemory(
Flag &= ~gcvALLOC_FLAG_4GB_ADDR;
}
#if defined(CONFIG_ZONE_DMA32) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)
#if defined(CONFIG_ZONE_DMA32) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37) \
|| !defined(LINUX_CMA_FSL) || !LINUX_CMA_FSL
/* redirect DMA32 pool for CMA LIMIT request */
if (Flag & gcvALLOC_FLAG_CMA_LIMIT)
{