[PATCH] arm64: dts: rockchip: Fix GPU register width for RK3328

[PATCH] arm64: dts: rockchip: Fix GPU register width for RK3328

[Alex Bee]

As can be seen in RK3328's TRM the register range for the GPU is
0xff300000 to 0xff330000.
It would (and does in vendor kernel) overlap with the registers of
the HEVC encoder (node/driver do not exist yet in upstream kernel).
See already existing h265e_mmu node.

Fixes: 752fbc0c8da7 ("arm64: dts: rockchip: add rk3328 mali gpu node")
Signed-off-by: Alex Bee <knaerzche@gmail.com>
---
 arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
index 8c821acb21ff..da84be6f4715 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -599,7 +599,7 @@ saradc: adc@ff280000 {
 
 	gpu: gpu@ff300000 {
 		compatible = "rockchip,rk3328-mali", "arm,mali-450";
-		reg = <0x0 0xff300000 0x0 0x40000>;
+		reg = <0x0 0xff300000 0x0 0x30000>;
 		interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>,
 			     <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>,
-- 
2.27.0

Re: [PATCH] arm64: dts: rockchip: Fix GPU register width for RK3328

[Alex Bee]

Hi Heiko,

is there anything left to do for this one?

Same for:

https://patchwork.kernel.org/project/linux-rockchip/patch/20210623145918.187018-1-knaerzche@gmail.com/

and

https://patchwork.kernel.org/project/linux-rockchip/patch/20210623150208.187201-1-knaerzche@gmail.com/

Alex

Am 23.06.21 um 13:59 schrieb Alex Bee:
> As can be seen in RK3328's TRM the register range for the GPU is
> 0xff300000 to 0xff330000.
> It would (and does in vendor kernel) overlap with the registers of
> the HEVC encoder (node/driver do not exist yet in upstream kernel).
> See already existing h265e_mmu node.
>
> Fixes: 752fbc0c8da7 ("arm64: dts: rockchip: add rk3328 mali gpu node")
> Signed-off-by: Alex Bee <knaerzche@gmail.com>
> ---
>   arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
> index 8c821acb21ff..da84be6f4715 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
> @@ -599,7 +599,7 @@ saradc: adc@ff280000 {
>   
>   	gpu: gpu@ff300000 {
>   		compatible = "rockchip,rk3328-mali", "arm,mali-450";
> -		reg = <0x0 0xff300000 0x0 0x40000>;
> +		reg = <0x0 0xff300000 0x0 0x30000>;
>   		interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
>   			     <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>,
>   			     <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>,

Re: [PATCH] arm64: dts: rockchip: Fix GPU register width for RK3328

[Heiko Stuebner]

On Wed, 23 Jun 2021 13:59:26 +0200, Alex Bee wrote:
> As can be seen in RK3328's TRM the register range for the GPU is
> 0xff300000 to 0xff330000.
> It would (and does in vendor kernel) overlap with the registers of
> the HEVC encoder (node/driver do not exist yet in upstream kernel).
> See already existing h265e_mmu node.

Applied, thanks!

[1/1] arm64: dts: rockchip: Fix GPU register width for RK3328
      commit: 3f1c9b99f22c4784bd6f439a63bbf8a61c0335b1

Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>

Re: [PATCH] arm64: dts: rockchip: Fix GPU register width for RK3328

[Heiko Stuebner]

Hi Alex,

Am Montag, 23. August 2021, 00:19:08 CEST schrieb Alex Bee:
> Hi Heiko,
> 
> is there anything left to do for this one?

nope, there wasn't anything missing, I just somehow managed to overlook
the patch till your ping. As you can see from the other mail, it is
applied now :-)

Heiko

> 
> Same for:
> 
> https://patchwork.kernel.org/project/linux-rockchip/patch/20210623145918.187018-1-knaerzche@gmail.com/
> 
> and
> 
> https://patchwork.kernel.org/project/linux-rockchip/patch/20210623150208.187201-1-knaerzche@gmail.com/
> 
> Alex
> 
> Am 23.06.21 um 13:59 schrieb Alex Bee:
> > As can be seen in RK3328's TRM the register range for the GPU is
> > 0xff300000 to 0xff330000.
> > It would (and does in vendor kernel) overlap with the registers of
> > the HEVC encoder (node/driver do not exist yet in upstream kernel).
> > See already existing h265e_mmu node.
> >
> > Fixes: 752fbc0c8da7 ("arm64: dts: rockchip: add rk3328 mali gpu node")
> > Signed-off-by: Alex Bee <knaerzche@gmail.com>
> > ---
> >   arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
> > index 8c821acb21ff..da84be6f4715 100644
> > --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
> > +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
> > @@ -599,7 +599,7 @@ saradc: adc@ff280000 {
> >   
> >   	gpu: gpu@ff300000 {
> >   		compatible = "rockchip,rk3328-mali", "arm,mali-450";
> > -		reg = <0x0 0xff300000 0x0 0x40000>;
> > +		reg = <0x0 0xff300000 0x0 0x30000>;
> >   		interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
> >   			     <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>,
> >   			     <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>,
>