arm64: dts: qcom: sdm845: create common zap-shader node

In order to reduce duplication, move common GPU memory configuration
from individual board files to sdm845.dtsi.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: David Heidelberg <david@ixit.cz>
Link: https://lore.kernel.org/r/20251028-dt-zap-shader-v1-2-7eccb823b986@oss.qualcomm.com
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index 8abf3e909502f3c3b82c0ca3d7509fdaf23d882c..662722adf20b7d1b6a44a28ba3bbf6b3e373cd0d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -456,7 +456,6 @@
 &gpu {
        status = "okay";
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sdm845/a630_zap.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
index 83b98bad19dd2824650378da7ad02e6f41a68d9f..0ee2f4b99fbdb6bd8019187dbfab5f9977c8973f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
@@ -456,10 +456,6 @@
 
 &gpu {
        status = "okay";
-
-       zap-shader {
-               memory-region = <&gpu_mem>;
-       };
 };
 
 &ipa {

diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index 63d2993536ade229a84da16e811e8bc83c46bd15..971bdb9c3693bfafab820a5242a82874340b6c4f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -418,7 +418,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sdm845/a630_zap.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index eb708ebdb0202c7e453bd01124166dd050de8d28..3fe71adf1dbb0f05fc4aa0d0bf4d0c6bf14af6e4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -341,7 +341,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sdm845/oneplus6/a630_zap.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
index 493c69e9917461600b2400b6dde78443342139c8..45e9dda007cec2500bf5b6990e7d8b1ba56a67c6 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
@@ -253,7 +253,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sdm845/starqltechn/a630_zap.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index f0ae0159f32a05edc376007d1d792e70a51a0db5..238471267e1feace68487aa25f97748704ebb18c 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -425,7 +425,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sdm845/axolotl/a630_zap.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
index f3f4c0900572a85ec173539f09074ae9c1025591..f3ff0b3352bcf7c3eccf7ebe615cd2e40cee7847 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
@@ -428,7 +428,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sdm845/Sony/tama/a630_zap.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
index 7480c8d7ac5b7f84a742dc6c77943c547c49fafb..5b30ace99579d014d762865377d5e9fdd5bab371 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
@@ -248,7 +248,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sdm845/beryllium/a630_zap.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
index 1c50a0563bc4728e67fa2dca76bdb6a503ebf102..26f0900513169368ecfb65b01eedcaf1050e3f53 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
@@ -394,7 +394,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sdm845/polaris/a630_zap.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index 1c3a7371a2d371f78e13a5b0bc400f79c62d210b..8c90f652afff25a0860ae993e713f94dc9b39f00 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -4902,6 +4902,10 @@
 
                        status = "disabled";
 
+                       zap-shader {
+                               memory-region = <&gpu_mem>;
+                       };
+
                        gpu_opp_table: opp-table {
                                compatible = "operating-points-v2";
 

diff --git a/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts b/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts
index 117cc0133363bfb6ab1118312ab6be7f797a203b..57afb35770058b84c592db9f20e82ebb7c4f8374 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts
@@ -490,7 +490,6 @@
        status = "okay";
 
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sdm850/HUAWEI/AL09/qcdxkmsuc850.mbn";
        };
 };

diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
index 90efbb7e3799b9aa75ac4df84fe0006d470ae131..35121cbcd37b08029d3e1a12b99fca44f3e4846d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
@@ -358,7 +358,6 @@
 &gpu {
        status = "okay";
        zap-shader {
-               memory-region = <&gpu_mem>;
                firmware-name = "qcom/sdm850/LENOVO/81JL/qcdxkmsuc850.mbn";
        };
 };