MGS-1274-2 gpu: Integrate 5.0.11.p8 kernel driver

Integrate the kernel part for 5.0.11.p8 gpu driver release

Signed-off-by: Xianzhong <b07117@freescale.com>

5 files changed, 16 insertions, 10 deletions

diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h
index cf85fdca5e35..a6e55cbefab6 100644
--- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h
+++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_enum.h
@@ -322,6 +322,8 @@ typedef enum _gceFEATURE
     gcvFEATURE_PE_DITHER_FIX2,
     gcvFEATURE_LOD_FIX_FOR_BASELEVEL,
 
+    gcvFEATURE_MSAA_OQ_FIX,
+
     /* Insert features above this comment only. */
     gcvFEATURE_COUNT                /* Not a feature. */
 }
@@ -341,7 +343,7 @@ gceSWWA;
 
 
 /* Option Set*/
-typedef enum _gceOPITON
+typedef enum _gceOPTION
 {
     /* HW setting we take PREFER */
     gcvOPTION_PREFER_MULTIPIPE_RS = 0,
diff --git a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h
index ee2965853842..98d8245ca7b0 100644
--- a/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h
+++ b/drivers/mxc/gpu-viv/hal/kernel/inc/gc_hal_version.h
@@ -64,6 +64,6 @@
 
 #define gcvVERSION_BUILD     41671
 
-#define gcvVERSION_STRING    "5.0.11.p8.pre.41671"
+#define gcvVERSION_STRING    "5.0.11.p8.pre2.41671"
 
 #endif /* __gc_hal_version_h_ */
diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c
index 3ebdfc64da0f..468e0d8619f2 100644
--- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c
+++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_probe.c
@@ -139,7 +139,10 @@ static ulong registerMemSizeDEC300 = 2 << 10;
 module_param(registerMemSizeDEC300, ulong, 0644);
 #endif
 
-static ulong contiguousSize = 0;
+#ifndef gcdDEFAULT_CONTIGUOUS_SIZE
+#define gcdDEFAULT_CONTIGUOUS_SIZE (4 << 20)
+#endif
+static ulong contiguousSize = gcdDEFAULT_CONTIGUOUS_SIZE;
 module_param(contiguousSize, ulong, 0644);
 
 static ulong contiguousBase = 0;
diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
index cff8d325677d..ea01e5b60521 100644
--- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
+++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c
@@ -105,8 +105,8 @@ extern int unregister_thermal_notifier(struct notifier_block *nb);
 #endif
 #endif
 
-#ifndef gcdDEFAULT_CONTIGUOUS_SIZE
-#define gcdDEFAULT_CONTIGUOUS_SIZE (4 << 20)
+#ifndef gcdFSL_CONTIGUOUS_SIZE
+#define gcdFSL_CONTIGUOUS_SIZE (4 << 20)
 #endif
 
 static int initgpu3DMinClock = 1;
@@ -449,7 +449,7 @@ gckPLATFORM_AdjustParam(
     {
         if( Args->contiguousBase == 0 )
            Args->contiguousBase = res->start;
-        if( Args->contiguousSize == 0 )
+        if( Args->contiguousSize == ~0U )
            Args->contiguousSize = res->end - res->start + 1;
     }
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0)
@@ -466,11 +466,11 @@ gckPLATFORM_AdjustParam(
        Args->contiguousSize = pdata->reserved_mem_size;
      }
 #endif
-    if (Args->contiguousSize == 0)
+    if (Args->contiguousSize == ~0U)
     {
        gckOS_Print("Warning: No contiguous memory is reserverd for gpu.!\n ");
-       gckOS_Print("Warning: Will use default value(%d) for the reserved memory!\n ",gcdDEFAULT_CONTIGUOUS_SIZE);
-       Args->contiguousSize = gcdDEFAULT_CONTIGUOUS_SIZE;
+       gckOS_Print("Warning: Will use default value(%d) for the reserved memory!\n ",gcdFSL_CONTIGUOUS_SIZE);
+       Args->contiguousSize = gcdFSL_CONTIGUOUS_SIZE;
     }
 
     Args->gpu3DMinClock = initgpu3DMinClock;
diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config
index 3adb9bf939e7..0b2cb43027f2 100644
--- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config
+++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.config
@@ -1,4 +1,5 @@
-EXTRA_CFLAGS += -DgcdDEFAULT_CONTIGUOUS_SIZE=134217728
+EXTRA_CFLAGS += -DgcdDEFAULT_CONTIGUOUS_SIZE=~0U
+EXTRA_CFLAGS += -DgcdFSL_CONTIGUOUS_SIZE=134217728
 
 ifneq ($(CONFIG_ANDROID),)
 # build for android