[PATCH 0/3] arm64: dts: Support Mali450 on rk3328

[PATCH 0/3] arm64: dts: Support Mali450 on rk3328

[Heiko Stuebner]

Pretty standard setup. Tested with the kmscube demo running
using the lima kernel and gallium driver.


Heiko Stuebner (3):
  dt-bindings: gpu: mali-utgard: add rockchip,rk3328-mali compatible
  arm64: dts: rockchip: add rk3328 mali gpu node
  arm64: dts: rockchip: enable gpu on rk3328-rock64

 .../devicetree/bindings/gpu/arm,mali-utgard.txt    |  1 +
 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts     |  4 ++++
 arch/arm64/boot/dts/rockchip/rk3328.dtsi           | 23 ++++++++++++++++++++++
 3 files changed, 28 insertions(+)

-- 
2.14.2

[PATCH 1/3] dt-bindings: gpu: mali-utgard: add rockchip, rk3328-mali compatible

[Heiko Stuebner]

The rk3328 quad-core Cortex A53 uses a Mali-450MP2 with 2 PPs, so
add a compatible for it.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt b/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt
index c6814d7cc2b2..ad876548ab5d 100644
--- a/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt
+++ b/Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt
@@ -17,6 +17,7 @@ Required properties:
       + rockchip,rk3066-mali
       + rockchip,rk3188-mali
       + rockchip,rk3228-mali
+      + rockchip,rk3328-mali
       + stericsson,db8500-mali
 
   - reg: Physical base address and length of the GPU registers
-- 
2.14.2

[PATCH 2/3] arm64: dts: rockchip: add rk3328 mali gpu node

[Heiko Stuebner]

Add the core gpu node for the rk3328, a Mali450MP2.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 41d61840fb99..4bff6422f4da 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -543,6 +543,29 @@
 		status = "disabled";
 	};
 
+	gpu: gpu at ff300000 {
+		compatible = "rockchip,rk3328-mali", "arm,mali-450";
+		reg = <0x0 0xff300000 0x0 0x40000>;
+		interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "gp",
+				  "gpmmu",
+				  "pp",
+				  "pp0",
+				  "ppmmu0",
+				  "pp1",
+				  "ppmmu1";
+		clocks = <&cru ACLK_GPU>, <&cru ACLK_GPU>;
+		clock-names = "bus", "core";
+		resets = <&cru SRST_GPU_A>;
+		status = "disabled";
+	};
+
 	h265e_mmu: iommu at ff330200 {
 		compatible = "rockchip,iommu";
 		reg = <0x0 0xff330200 0 0x100>;
-- 
2.14.2

[PATCH 3/3] arm64: dts: rockchip: enable gpu on rk3328-rock64

[Heiko Stuebner]

Enable the Mali450MP2 on the Rock64 board.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
index d4f80786e7c2..4351fdd1f101 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
@@ -144,6 +144,10 @@
 	status = "okay";
 };
 
+&gpu {
+	status = "okay";
+};
+
 &i2c1 {
 	status = "okay";
 
-- 
2.14.2

[PATCH 1/3] dt-bindings: gpu: mali-utgard: add rockchip,rk3328-mali compatible

[Rob Herring]

On Sat, Dec 09, 2017 at 01:07:36AM +0100, Heiko Stuebner wrote:
> The rk3328 quad-core Cortex A53 uses a Mali-450MP2 with 2 PPs, so
> add a compatible for it.
> 
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> ---
>  Documentation/devicetree/bindings/gpu/arm,mali-utgard.txt | 1 +
>  1 file changed, 1 insertion(+)

For the series,

Reviewed-by: Rob Herring <robh@kernel.org>

Though I don't think it's really necessary to enable the gpu per board 
as it has no pinout. Default enabled would be better IMO.

Rob

[PATCH 0/3] arm64: dts: Support Mali450 on rk3328

[Heiko Stuebner]

Am Samstag, 9. Dezember 2017, 01:07:35 CET schrieb Heiko Stuebner:
> Pretty standard setup. Tested with the kmscube demo running
> using the lima kernel and gallium driver.
> 
> 
> Heiko Stuebner (3):
>   dt-bindings: gpu: mali-utgard: add rockchip,rk3328-mali compatible
>   arm64: dts: rockchip: add rk3328 mali gpu node
>   arm64: dts: rockchip: enable gpu on rk3328-rock64

applied for 4.16 with Robs review and following his suggestion
of making the gpu simply always-on and thus droppping patch 3.