diff --git a/patch/kernel/rockchip-dev/0000-mali-r19p0-01rel0.patch b/patch/kernel/rockchip-dev/0000-mali-r19p0-01rel0.patch.disabled similarity index 100% rename from patch/kernel/rockchip-dev/0000-mali-r19p0-01rel0.patch rename to patch/kernel/rockchip-dev/0000-mali-r19p0-01rel0.patch.disabled diff --git a/patch/kernel/rockchip-dev/0001-midgard-mali_kbase-include-linux-sched-task_stack.h.patch b/patch/kernel/rockchip-dev/0001-midgard-mali_kbase-include-linux-sched-task_stack.h.patch.disabled similarity index 89% rename from patch/kernel/rockchip-dev/0001-midgard-mali_kbase-include-linux-sched-task_stack.h.patch rename to patch/kernel/rockchip-dev/0001-midgard-mali_kbase-include-linux-sched-task_stack.h.patch.disabled index b6740ef98..3f2584e12 100644 --- a/patch/kernel/rockchip-dev/0001-midgard-mali_kbase-include-linux-sched-task_stack.h.patch +++ b/patch/kernel/rockchip-dev/0001-midgard-mali_kbase-include-linux-sched-task_stack.h.patch.disabled @@ -25,14 +25,15 @@ diff --git a/drivers/gpu/arm/midgard/mali_kbase.h b/drivers/gpu/arm/midgard/mali index 56b364e5..9dd547f2 100644 --- a/drivers/gpu/arm/midgard/mali_kbase.h +++ b/drivers/gpu/arm/midgard/mali_kbase.h -@@ -36,6 +36,7 @@ +@@ -35,6 +35,8 @@ + #include #include #include - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)) +#include - #include - #endif ++#include #include + #include + #include -- 2.11.0 diff --git a/patch/kernel/rockchip-dev/0002-Using-the-new-header-on-4.12-kernels-for-copy_-_user.patch b/patch/kernel/rockchip-dev/0002-Using-the-new-header-on-4.12-kernels-for-copy_-_user.patch.disabled similarity index 100% rename from patch/kernel/rockchip-dev/0002-Using-the-new-header-on-4.12-kernels-for-copy_-_user.patch rename to patch/kernel/rockchip-dev/0002-Using-the-new-header-on-4.12-kernels-for-copy_-_user.patch.disabled diff --git a/patch/kernel/rockchip-dev/0003-Adapt-get_user_pages-calls-to-use-the-new-calling-pr.patch b/patch/kernel/rockchip-dev/0003-Adapt-get_user_pages-calls-to-use-the-new-calling-pr.patch.disabled similarity index 100% rename from patch/kernel/rockchip-dev/0003-Adapt-get_user_pages-calls-to-use-the-new-calling-pr.patch rename to patch/kernel/rockchip-dev/0003-Adapt-get_user_pages-calls-to-use-the-new-calling-pr.patch.disabled diff --git a/patch/kernel/rockchip-dev/0004-Don-t-be-TOO-severe-when-looking-for-the-IRQ-names.patch b/patch/kernel/rockchip-dev/0004-Don-t-be-TOO-severe-when-looking-for-the-IRQ-names.patch.disabled similarity index 100% rename from patch/kernel/rockchip-dev/0004-Don-t-be-TOO-severe-when-looking-for-the-IRQ-names.patch rename to patch/kernel/rockchip-dev/0004-Don-t-be-TOO-severe-when-looking-for-the-IRQ-names.patch.disabled diff --git a/patch/kernel/rockchip-dev/0005-Added-the-new-compatible-list-mainly-used-by-Rockchi.patch b/patch/kernel/rockchip-dev/0005-Added-the-new-compatible-list-mainly-used-by-Rockchi.patch.disabled similarity index 100% rename from patch/kernel/rockchip-dev/0005-Added-the-new-compatible-list-mainly-used-by-Rockchi.patch rename to patch/kernel/rockchip-dev/0005-Added-the-new-compatible-list-mainly-used-by-Rockchi.patch.disabled diff --git a/patch/kernel/rockchip-dev/1001-Integrating-the-Mali-drivers.patch b/patch/kernel/rockchip-dev/1001-Integrating-the-Mali-drivers.patch.disabled similarity index 100% rename from patch/kernel/rockchip-dev/1001-Integrating-the-Mali-drivers.patch rename to patch/kernel/rockchip-dev/1001-Integrating-the-Mali-drivers.patch.disabled diff --git a/patch/kernel/rockchip-dev/1004-Remove-the-dependency-to-the-clk_mali-symbol.patch b/patch/kernel/rockchip-dev/1004-Remove-the-dependency-to-the-clk_mali-symbol.patch.disabled similarity index 100% rename from patch/kernel/rockchip-dev/1004-Remove-the-dependency-to-the-clk_mali-symbol.patch rename to patch/kernel/rockchip-dev/1004-Remove-the-dependency-to-the-clk_mali-symbol.patch.disabled diff --git a/patch/kernel/rockchip-dev/2012-ARM-DTSI-rk3288-Add-the-RGA-node.patch b/patch/kernel/rockchip-dev/2012-ARM-DTSI-rk3288-Add-the-RGA-node.patch deleted file mode 100644 index 280789941..000000000 --- a/patch/kernel/rockchip-dev/2012-ARM-DTSI-rk3288-Add-the-RGA-node.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3fe37d29b53e3d06c8f4314cfc113bfa679f67eb Mon Sep 17 00:00:00 2001 -From: Myy Miouyouyou -Date: Thu, 19 Oct 2017 21:48:05 +0200 -Subject: [PATCH 15/28] ARM: DTSI: rk3288.dtsi: Add the RGA node - -Imported from @wzyy2 patches. - -Signed-off-by: Myy Miouyouyou ---- - arch/arm/boot/dts/rk3288.dtsi | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi -index 10ecebb4..455446f6 100644 ---- a/arch/arm/boot/dts/rk3288.dtsi -+++ b/arch/arm/boot/dts/rk3288.dtsi -@@ -1159,6 +1159,20 @@ - }; - }; - -+ rga: rga@ff920000 { -+ compatible = "rockchip,rk3288-rga"; -+ reg = <0x0 0xff920000 0x0 0x180>; -+ interrupts = ; -+ interrupt-names = "rga"; -+ clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA>; -+ clock-names = "aclk", "hclk", "sclk"; -+ power-domains = <&power RK3288_PD_VIO>; -+ resets = <&cru SRST_RGA_CORE>, <&cru SRST_RGA_AXI>, <&cru SRST_RGA_AHB>; -+ -+ reset-names = "core", "axi", "ahb"; -+ status = "disabled"; -+ }; -+ - vpu_mmu: iommu@ff9a0800 { - compatible = "rockchip,iommu"; - reg = <0x0 0xff9a0800 0x0 0x100>; --- -2.11.0 - diff --git a/patch/kernel/rockchip-dev/increasing_DMA_block_memory_allocation_to_2048.patch b/patch/kernel/rockchip-dev/increasing_DMA_block_memory_allocation_to_2048.patch index 1c4d60250..1abf64b19 100644 --- a/patch/kernel/rockchip-dev/increasing_DMA_block_memory_allocation_to_2048.patch +++ b/patch/kernel/rockchip-dev/increasing_DMA_block_memory_allocation_to_2048.patch @@ -8,6 +8,6 @@ index bd83c53..af7cfe3 -#define DEFAULT_DMA_COHERENT_POOL_SIZE SZ_256K +#define DEFAULT_DMA_COHERENT_POOL_SIZE SZ_2M - static struct gen_pool *atomic_pool; + static struct gen_pool *atomic_pool __ro_after_init; static size_t atomic_pool_size = DEFAULT_DMA_COHERENT_POOL_SIZE;