diff --git a/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv-5.0.11.p8.6+fslc/0001-mxc-gpu-use-recommended-values-for-minimum-GPU-frequ.patch b/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv-5.0.11.p8.6+fslc/0001-mxc-gpu-use-recommended-values-for-minimum-GPU-frequ.patch deleted file mode 100644 index 85f23d5a6..000000000 --- a/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv-5.0.11.p8.6+fslc/0001-mxc-gpu-use-recommended-values-for-minimum-GPU-frequ.patch +++ /dev/null @@ -1,70 +0,0 @@ -From: Javier Viguera -Date: Tue, 10 Nov 2015 17:45:37 +0100 -Subject: [PATCH] mxc: gpu: use recommended values for minimum GPU frequency - divisor - -Freescale recommends the following default minimum GPU frequency divisors -depending on the CPU family: - - 3 for Dual/Quad - - 8 for DualLite/Solo - -Adapted for the external Vivante GPU driver from commit a790ad3 in linux -git repository. - -Signed-off-by: Javier Viguera ---- - .../hal/os/linux/kernel/gc_hal_kernel_probe.c | 13 ++++++++++++- - .../platform/freescale/gc_hal_kernel_platform_imx6q14.c | 2 +- - 2 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/gc_hal_kernel_probe.c b/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/gc_hal_kernel_probe.c -index 93a19d51303c..71c4ea3a33bd 100644 ---- a/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/gc_hal_kernel_probe.c -+++ b/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/gc_hal_kernel_probe.c -@@ -54,6 +54,7 @@ - - - #include -+#include - #include - - #include "gc_hal_kernel_linux.h" -@@ -190,7 +191,7 @@ module_param(showArgs, int, 0644); - static int mmu = 1; - module_param(mmu, int, 0644); - --static int gpu3DMinClock = 1; -+static int gpu3DMinClock = 0; - - static int contiguousRequested = 0; - -@@ -1115,6 +1116,16 @@ static int __devinit gpu_probe(struct platform_device *pdev) - _UpdateModuleParam(&moduleParam); - } - -+ /* If undefined, set Freescale recommended value. Else use the min freq. */ -+ if (gpu3DMinClock == 0) { -+ if (of_machine_is_compatible("fsl,imx6dl")) -+ gpu3DMinClock = 8; -+ else if (of_machine_is_compatible("fsl,imx6q")) -+ gpu3DMinClock = 3; -+ else -+ gpu3DMinClock = 1; -+ } -+ - ret = drv_init(); - - if (!ret) -diff --git a/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c b/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c -index dc7c9769ab75..0eae8262c2ce 100644 ---- a/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c -+++ b/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c -@@ -109,7 +109,7 @@ extern int unregister_thermal_notifier(struct notifier_block *nb); - #define gcdFSL_CONTIGUOUS_SIZE (4 << 20) - #endif - --static int initgpu3DMinClock = 1; -+static int initgpu3DMinClock = 0; - module_param(initgpu3DMinClock, int, 0644); - - struct platform_device *pdevice; diff --git a/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv-5.0.11.p8.6+fslc/0002-Use-busfreq-imx6.h-up-to-3.15-kernel.patch b/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv-5.0.11.p8.6+fslc/0002-Use-busfreq-imx6.h-up-to-3.15-kernel.patch deleted file mode 100644 index 3abaaf9a6..000000000 --- a/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv-5.0.11.p8.6+fslc/0002-Use-busfreq-imx6.h-up-to-3.15-kernel.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Hector Palacios -Date: Tue, 1 Dec 2015 11:36:24 +0100 -Subject: [PATCH] Use busfreq-imx6.h up to 3.15 kernel - -For CC6 we're using Freescale 3.14.28 BSP. Even though we apply stability -patches that move the kernel version beyond 3.14.29 we still want to use -the GPU vivante external module build with the original BSP. - -Signed-off-by: Hector Palacios ---- - .../os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c b/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c -index 0eae8262c2ce..f166680affa2 100644 ---- a/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c -+++ b/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c -@@ -74,7 +74,7 @@ - #include - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) - #include --#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 29) -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) - #include - #include - #else diff --git a/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv-5.0.11.p8.6+fslc/0003-gpu-Get-GPU-reserved-memory-from-DT.patch b/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv-5.0.11.p8.6+fslc/0003-gpu-Get-GPU-reserved-memory-from-DT.patch deleted file mode 100644 index 3655df14e..000000000 --- a/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv-5.0.11.p8.6+fslc/0003-gpu-Get-GPU-reserved-memory-from-DT.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Mike Engel -Date: Tue, 11 Apr 2017 11:13:23 +0200 -Subject: [PATCH] gpu: Get GPU reserved memory from DT. - -This commit adds support to specify the GPU reserved memory in -the DT. - -Signed-off-by: Mike Engel - -https://jira.digi.com/browse/DEL-3868 ---- - .../linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c b/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c -index dc7c976..fd2dbd3 100644 ---- a/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c -+++ b/kernel-module-imx-gpu-viv-src/hal/os/linux/kernel/platform/freescale/gc_hal_kernel_platform_imx6q14.c -@@ -444,7 +444,7 @@ gckPLATFORM_AdjustParam( - Args->registerMemSizeVG = res->end - res->start + 1; - } - --#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "contiguous_mem"); - if (res) - { -@@ -453,8 +453,6 @@ gckPLATFORM_AdjustParam( - if( Args->contiguousSize == ~0U ) - Args->contiguousSize = res->end - res->start + 1; - } --#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,10,0) -- Args->contiguousBase = 0; - #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) - prop = of_get_property(dn, "contiguousbase", NULL); - if(prop) - - diff --git a/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.6+fslc.bbappend b/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.6+fslc.bbappend deleted file mode 100644 index a0c759e21..000000000 --- a/meta-digi-arm/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_5.0.11.p8.6+fslc.bbappend +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (C) 2015-2017 Digi International - -VER_DIR = "${@d.getVar('PV', True).split('+git')[0]}" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-${VER_DIR}:" - -SRC_URI += " \ - file://0001-mxc-gpu-use-recommended-values-for-minimum-GPU-frequ.patch \ - file://0002-Use-busfreq-imx6.h-up-to-3.15-kernel.patch \ - file://0003-gpu-Get-GPU-reserved-memory-from-DT.patch \ -"