Re: [PATCH v11 2/4] arm64: dts: mt8183: Add node for the Mali GPU
On Tue, Apr 20, 2021 at 11:33 PM Neil Armstrong wrote:
>
> On 26/01/2021 02:17, Nicolas Boichat wrote:
> > Add a basic GPU node for mt8183.
> >
> > Signed-off-by: Nicolas Boichat
> > ---
> > The binding we use with out-of-tree Mali drivers includes more
> > clocks, this is used for devfreq: the out-of-tree driver switches
> > clk_mux to clk_sub_parent (26Mhz), adjusts clk_main_parent, then
> > switches clk_mux back to clk_main_parent:
> > (see
> > https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-4.19/drivers/gpu/arm/midgard/platform/mediatek/mali_kbase_runtime_pm.c#423)
> > clocks =
> > < CLK_TOP_MFGPLL_CK>,
> > < CLK_TOP_MUX_MFG>,
> > <>,
> > < CLK_MFG_BG3D>;
> > clock-names =
> > "clk_main_parent",
> > "clk_mux",
> > "clk_sub_parent",
> > "subsys_mfg_cg";
> > (based on discussions, this probably belongs in the clock core)
> >
> > This only matters for devfreq, that is disabled anyway as we don't
> > have platform-specific code to handle >1 supplies.
> >
> > Changes in v11:
> > - mt8183*.dts: remove incorrect supply-names
> >
> > Changes in v10: None
> > Changes in v9: None
> > Changes in v8: None
> > Changes in v7: None
> > Changes in v6:
> > - Add gpu regulators to kukui dtsi as well.
> > - Power domains are now attached to spm, not scpsys
> > - Drop R-B.
> >
> > Changes in v5:
> > - Rename "2d" power domain to "core2" (keep R-B again).
> >
> > Changes in v4:
> > - Add power-domain-names to describe the 3 domains.
> >(kept Alyssa's reviewed-by as the change is minor)
> >
> > Changes in v3: None
> > Changes in v2:
> > - Use sram instead of mali_sram as SRAM supply name.
> > - Rename mali@ to gpu@.
> >
> > arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 5 +
> > .../arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 5 +
> > arch/arm64/boot/dts/mediatek/mt8183.dtsi | 105 ++
> > 3 files changed, 115 insertions(+)
> >
>
> If you re-spin, you can also add the same changes to mt8183-pumpkin.dts :
Will do in v12.
> diff --git a/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts
> b/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts
> index eb6e595c2975..cc23e5df391e 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts
> +++ b/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts
> @@ -68,6 +68,11 @@ {
> status = "okay";
> };
>
> + {
> + mali-supply = <_vgpu_reg>;
> + sram-supply = <_vsram_gpu_reg>;
> +};
> +
> {
> pinctrl-names = "default";
> pinctrl-0 = <_pins_0>;
>
> I did a boot-test of the platform with panfrost and drm-misc-next and it
> worked fine.
Great news thanks!
>
> Thanks,
> Neil
>
> > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts
> > b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts
> > index cba2d8933e79..1cfbea5a0101 100644
> > --- a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts
> > +++ b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts
> > @@ -42,6 +42,11 @@ {
> > status = "okay";
> > };
> >
> > + {
> > + mali-supply = <_vgpu_reg>;
> > + sram-supply = <_vsram_gpu_reg>;
> > +};
> > +
> > {
> > pinctrl-names = "default";
> > pinctrl-0 = <_pins_0>;
> > diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
> > b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
> > index bf2ad1294dd3..a38315b604df 100644
> > --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
> > +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
> > @@ -249,6 +249,11 @@ {
> > proc-supply = <_vproc11_reg>;
> > };
> >
> > + {
> > + mali-supply = <_vgpu_reg>;
> > + sram-supply = <_vsram_gpu_reg>;
> > +};
> > +
> > {
> > pinctrl-names = "default";
> > pinctrl-0 = <_pins>;
> > diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> > b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> > index 5b782a4769e7..5430e05e18a0 100644
> > --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> > +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> > @@ -964,6 +964,111 @@ mfgcfg: syscon@1300 {
> > #clock-cells = <1>;
> > };
> >
> > + gpu: gpu@1304 {
> > + compatible = "mediatek,mt8183-mali",
> > "arm,mali-bifrost";
> > + reg = <0 0x1304 0 0x4000>;
> > + interrupts =
> > + ,
> > + ,
> > + ;
> > + interrupt-names = "job", "mmu", "gpu";
> > +
> > + clocks = < CLK_TOP_MFGPLL_CK>;
> > +
> > + power-domains =
> > + < MT8183_POWER_DOMAIN_MFG_CORE0>,
> > + < MT8183_POWER_DOMAIN_MFG_CORE1>,
> > + < MT8183_POWER_DOMAIN_MFG_2D>;
> > + power-domain-names = "core0", "core1", "core2";
> > +
> > + operating-points-v2 = <_opp_table>;
> > + };
> > +
>
Re: [PATCH v11 2/4] arm64: dts: mt8183: Add node for the Mali GPU
On 26/01/2021 02:17, Nicolas Boichat wrote:
> Add a basic GPU node for mt8183.
>
> Signed-off-by: Nicolas Boichat
> ---
> The binding we use with out-of-tree Mali drivers includes more
> clocks, this is used for devfreq: the out-of-tree driver switches
> clk_mux to clk_sub_parent (26Mhz), adjusts clk_main_parent, then
> switches clk_mux back to clk_main_parent:
> (see
> https://chromium.googlesource.com/chromiumos/third_party/kernel/+/chromeos-4.19/drivers/gpu/arm/midgard/platform/mediatek/mali_kbase_runtime_pm.c#423)
> clocks =
> < CLK_TOP_MFGPLL_CK>,
> < CLK_TOP_MUX_MFG>,
> <>,
> < CLK_MFG_BG3D>;
> clock-names =
> "clk_main_parent",
> "clk_mux",
> "clk_sub_parent",
> "subsys_mfg_cg";
> (based on discussions, this probably belongs in the clock core)
>
> This only matters for devfreq, that is disabled anyway as we don't
> have platform-specific code to handle >1 supplies.
>
> Changes in v11:
> - mt8183*.dts: remove incorrect supply-names
>
> Changes in v10: None
> Changes in v9: None
> Changes in v8: None
> Changes in v7: None
> Changes in v6:
> - Add gpu regulators to kukui dtsi as well.
> - Power domains are now attached to spm, not scpsys
> - Drop R-B.
>
> Changes in v5:
> - Rename "2d" power domain to "core2" (keep R-B again).
>
> Changes in v4:
> - Add power-domain-names to describe the 3 domains.
>(kept Alyssa's reviewed-by as the change is minor)
>
> Changes in v3: None
> Changes in v2:
> - Use sram instead of mali_sram as SRAM supply name.
> - Rename mali@ to gpu@.
>
> arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 5 +
> .../arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 5 +
> arch/arm64/boot/dts/mediatek/mt8183.dtsi | 105 ++
> 3 files changed, 115 insertions(+)
>
If you re-spin, you can also add the same changes to mt8183-pumpkin.dts :
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts
b/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts
index eb6e595c2975..cc23e5df391e 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts
@@ -68,6 +68,11 @@ {
status = "okay";
};
+ {
+ mali-supply = <_vgpu_reg>;
+ sram-supply = <_vsram_gpu_reg>;
+};
+
{
pinctrl-names = "default";
pinctrl-0 = <_pins_0>;
I did a boot-test of the platform with panfrost and drm-misc-next and it worked
fine.
Thanks,
Neil
> diff --git a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts
> b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts
> index cba2d8933e79..1cfbea5a0101 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8183-evb.dts
> +++ b/arch/arm64/boot/dts/mediatek/mt8183-evb.dts
> @@ -42,6 +42,11 @@ {
> status = "okay";
> };
>
> + {
> + mali-supply = <_vgpu_reg>;
> + sram-supply = <_vsram_gpu_reg>;
> +};
> +
> {
> pinctrl-names = "default";
> pinctrl-0 = <_pins_0>;
> diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
> b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
> index bf2ad1294dd3..a38315b604df 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
> +++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
> @@ -249,6 +249,11 @@ {
> proc-supply = <_vproc11_reg>;
> };
>
> + {
> + mali-supply = <_vgpu_reg>;
> + sram-supply = <_vsram_gpu_reg>;
> +};
> +
> {
> pinctrl-names = "default";
> pinctrl-0 = <_pins>;
> diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> index 5b782a4769e7..5430e05e18a0 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> +++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
> @@ -964,6 +964,111 @@ mfgcfg: syscon@1300 {
> #clock-cells = <1>;
> };
>
> + gpu: gpu@1304 {
> + compatible = "mediatek,mt8183-mali", "arm,mali-bifrost";
> + reg = <0 0x1304 0 0x4000>;
> + interrupts =
> + ,
> + ,
> + ;
> + interrupt-names = "job", "mmu", "gpu";
> +
> + clocks = < CLK_TOP_MFGPLL_CK>;
> +
> + power-domains =
> + < MT8183_POWER_DOMAIN_MFG_CORE0>,
> + < MT8183_POWER_DOMAIN_MFG_CORE1>,
> + < MT8183_POWER_DOMAIN_MFG_2D>;
> + power-domain-names = "core0", "core1", "core2";
> +
> + operating-points-v2 = <_opp_table>;
> + };
> +
> + gpu_opp_table: opp_table0 {
> + compatible = "operating-points-v2";
> + opp-shared;
> +
> + opp-3 {
> + opp-hz = /bits/ 64 <3>;
> + opp-microvolt = <625000>, <85>;
> + };
> +
> +
