From: Xianzhong <xianzhong.li@nxp.com>
Date: Mon, 28 Oct 2019 14:12:10 +0000 (+0800)
Subject: MGS-5283 [#imx-1784] fix GPU AXI bus error
X-Git-Tag: rel_imx_4.19.35_1.1.0~4
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=656fa3ea8c44635dbf991275118953ba65334ad8;p=linux.git

MGS-5283 [#imx-1784] fix GPU AXI bus error

Fix GPU safe memory with gcvALLOC_FLAG_4GB_ADDR

Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
(cherry picked from commit 34b0f803e1ae45db7456fb732612fcdd87ef747a)
---

diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
index 1b87767918fb..96aa8eddd455 100644
--- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
+++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
@@ -1874,7 +1874,7 @@ _Construct(
         Kernel,
         256,
         gcvVIDMEM_TYPE_COMMAND,
-        gcvALLOC_FLAG_CONTIGUOUS | gcvALLOC_FLAG_4K_PAGES,
+        gcvALLOC_FLAG_CONTIGUOUS | gcvALLOC_FLAG_4K_PAGES | gcvALLOC_FLAG_4GB_ADDR,
         &mmu->safePageSize,
         &pool,
         &mmu->safePageVideoMem