From bc6acc5b0a87425136d0bd383d04598f79ce8671 Mon Sep 17 00:00:00 2001 From: JMCC Date: Mon, 4 Jan 2021 15:41:36 +0100 Subject: [PATCH] rockchip64/rk3399 legacy: Enable RGA for 64-bit Rockchips --- packages/bsp/rk3399/50-rk3399-vpu.rules | 2 +- .../0003-enable-rga-rk3399.patch | 37 ++++++++++++++ .../0003-enable-rga-rockchip64.patch | 51 +++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 patch/kernel/rk3399-legacy/0003-enable-rga-rk3399.patch create mode 100644 patch/kernel/rockchip64-legacy/0003-enable-rga-rockchip64.patch diff --git a/packages/bsp/rk3399/50-rk3399-vpu.rules b/packages/bsp/rk3399/50-rk3399-vpu.rules index a823bcb794..67aa30b304 100644 --- a/packages/bsp/rk3399/50-rk3399-vpu.rules +++ b/packages/bsp/rk3399/50-rk3399-vpu.rules @@ -1,3 +1,3 @@ KERNEL=="vpu_service", MODE="0660", GROUP="video" KERNEL=="rkvdec", MODE="0660", GROUP="video" - +KERNEL=="rga", MODE="0660", GROUP="video" diff --git a/patch/kernel/rk3399-legacy/0003-enable-rga-rk3399.patch b/patch/kernel/rk3399-legacy/0003-enable-rga-rk3399.patch new file mode 100644 index 0000000000..f5ba08afe6 --- /dev/null +++ b/patch/kernel/rk3399-legacy/0003-enable-rga-rk3399.patch @@ -0,0 +1,37 @@ +From f1f3e20f9c9cd4d697c6e3862791e5ebb198623f Mon Sep 17 00:00:00 2001 +From: JMCC +Date: Sat, 2 Jan 2021 22:42:11 +0100 +Subject: [PATCH] enable-rga + +Signed-off-by: JMCC +--- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi +index 0ddb03f36..0125fc6e2 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi +@@ -1447,15 +1447,16 @@ + }; + + rga: rga@ff680000 { +- compatible = "rockchip,rk3399-rga"; ++ compatible = "rockchip,rga2"; ++ dev_mode = <1>; + reg = <0x0 0xff680000 0x0 0x10000>; + interrupts = ; + clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA_CORE>; +- clock-names = "aclk", "hclk", "sclk"; ++ clock-names = "aclk_rga", "hclk_rga", "clk_rga"; + resets = <&cru SRST_RGA_CORE>, <&cru SRST_A_RGA>, <&cru SRST_H_RGA>; + reset-names = "core", "axi", "ahb"; + power-domains = <&power RK3399_PD_RGA>; +- status = "disabled"; ++ status = "okay"; + }; + + efuse0: efuse@ff690000 { +-- +Created with Armbian build tools https://github.com/armbian/build + diff --git a/patch/kernel/rockchip64-legacy/0003-enable-rga-rockchip64.patch b/patch/kernel/rockchip64-legacy/0003-enable-rga-rockchip64.patch new file mode 100644 index 0000000000..4dfb7c3c80 --- /dev/null +++ b/patch/kernel/rockchip64-legacy/0003-enable-rga-rockchip64.patch @@ -0,0 +1,51 @@ +From f1f3e20f9c9cd4d697c6e3862791e5ebb198623f Mon Sep 17 00:00:00 2001 +From: JMCC +Date: Sat, 2 Jan 2021 22:42:11 +0100 +Subject: [PATCH] enable-rga + +Signed-off-by: JMCC +--- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 7 ++++--- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi +index e2f897baf..ac71ce493 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi +@@ -991,7 +991,7 @@ + clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA>; + clock-names = "aclk_rga", "hclk_rga", "clk_rga"; + dma-coherent; +- status = "disabled"; ++ status = "okay"; + }; + + iep: iep@ff3a0000 { +diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi +index 0ddb03f36..0125fc6e2 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi ++++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi +@@ -1447,15 +1447,16 @@ + }; + + rga: rga@ff680000 { +- compatible = "rockchip,rk3399-rga"; ++ compatible = "rockchip,rga2"; ++ dev_mode = <1>; + reg = <0x0 0xff680000 0x0 0x10000>; + interrupts = ; + clocks = <&cru ACLK_RGA>, <&cru HCLK_RGA>, <&cru SCLK_RGA_CORE>; +- clock-names = "aclk", "hclk", "sclk"; ++ clock-names = "aclk_rga", "hclk_rga", "clk_rga"; + resets = <&cru SRST_RGA_CORE>, <&cru SRST_A_RGA>, <&cru SRST_H_RGA>; + reset-names = "core", "axi", "ahb"; + power-domains = <&power RK3399_PD_RGA>; +- status = "disabled"; ++ status = "okay"; + }; + + efuse0: efuse@ff690000 { +-- +Created with Armbian build tools https://github.com/armbian/build +