arm64: dts: qcom: msm8916/39: Disable GPU by default

MSM8916/39 do not need signed GPU firmware so it is generally okay to
have it enabled by default. However, currently the GPU does not work
without also enabling MDSS and it's questionable if someone would
really need it without a display in practice.

For consistency let's follow newer SoCs and disable the GPU by default.
Enable it for all existing devices that already have &mdss enabled.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Link: https://lore.kernel.org/r/20230911-msm8916-rmem-v1-2-b7089ec3e3a1@gerhold.net
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index ccbafde16d1fbb0beffd047d56c6ab498bdc9399..336287c5da9e51182a1c5160b655bf7c722fb0ff 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -230,6 +230,10 @@
        status = "okay";
 };
 
+&gpu {
+       status = "okay";
+};
+
 &lpass {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts
index 027d1da7e81dbb7c3dd85b15b023fe9d4e2e9800..f591d6e78d6e83433d159a60346a1b2296cb96ef 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts
+++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts
@@ -131,6 +131,10 @@
        status = "okay";
 };
 
+&gpu {
+       status = "okay";
+};
+
 &lpass {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index 5f78004a24bd16e776560e1d71ef0c1b9d2fbdce..15d2486cdb4538f74d004eb11fce4acd4f816bd1 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -239,6 +239,10 @@
        status = "okay";
 };
 
+&gpu {
+       status = "okay";
+};
+
 &mdss {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 8d63593e9252a22cdee8c0be4cc6a092ff8ef255..9326ba0ea245c37af7c3243da4fa22a37e8d8570 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1750,7 +1750,7 @@
                        };
                };
 
-               gpu@1c00000 {
+               gpu: gpu@1c00000 {
                        compatible = "qcom,adreno-306.0", "qcom,adreno";
                        reg = <0x01c00000 0x20000>;
                        reg-names = "kgsl_3d0_reg_memory";
@@ -1773,6 +1773,7 @@
                        power-domains = <&gcc OXILI_GDSC>;
                        operating-points-v2 = <&gpu_opp_table>;
                        iommus = <&gpu_iommu 1>, <&gpu_iommu 2>;
+                       status = "disabled";
 
                        gpu_opp_table: opp-table {
                                compatible = "operating-points-v2";

diff --git a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
index 89b6aebba40455719a5274073acfcea438647994..cb893345c44b32539034b4e21e653d1d7a2d945f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
+++ b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
@@ -39,6 +39,10 @@
        };
 };
 
+&gpu {
+       status = "okay";
+};
+
 &mdss {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi
index 6e24f0f2374fe5a16bc02d46fd9ecd9c9af01972..b0a64e468629d0dd9b0a6e8c6b27ddef126043d4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8939.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi
@@ -1395,7 +1395,7 @@
                        };
                };
 
-               gpu@1c00000 {
+               gpu: gpu@1c00000 {
                        compatible = "qcom,adreno-405.0", "qcom,adreno";
                        reg = <0x01c00000 0x10000>;
                        reg-names = "kgsl_3d0_reg_memory";
@@ -1418,6 +1418,7 @@
                        power-domains = <&gcc OXILI_GDSC>;
                        operating-points-v2 = <&opp_table>;
                        iommus = <&gpu_iommu 1>, <&gpu_iommu 2>;
+                       status = "disabled";
 
                        opp_table: opp-table {
                                compatible = "operating-points-v2";