From 3fc1a2719ee8348b48ca7b14304d0cca965daad3 Mon Sep 17 00:00:00 2001 From: Xianzhong Date: Fri, 30 Dec 2016 17:55:22 +0800 Subject: [PATCH] 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 (cherry picked from commit 32c43d676dba1a3b6cdb22b2532547e8888f83b9) --- .../kernel/platform/freescale/gc_hal_kernel_platform_imx6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ab23518903dd..f9d01fd74f17 100644 --- 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; -- 2.17.1