MGS-2133-3 [#imx-199] refine flat mapping setting for i.MX8

allow to set the flat mapping in uboot configuration first.

Date: Dec 30, 2016
Signed-off-by: Xianzhong <xianzhong.li@nxp.com>
(cherry picked from commit 32c43d676dba1a3b6cdb22b2532547e8888f83b9)

diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.c
index ab23518..f9d01fd 100644 (file)
--- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.c
+++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6.c
@@ -426,7 +426,7 @@ gckPLATFORM_AdjustParam(
     const char *iobase_3d_res[2] = {"iobase_3d_0", "iobase_3d_1"};
 
     res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phys_baseaddr");
-    if (res)
+    if (res && !Args->baseAddress && !Args->physSize)
     {
         Args->baseAddress = res->start;
         Args->physSize = res->end - res->start + 1;