From: Dmitry Baryshkov Date: Tue, 28 Oct 2025 21:00:01 +0000 (+0200) Subject: arm64: dts: qcom: sdm845: create common zap-shader node X-Git-Tag: v6.19-rc1~100^2~14^2~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8464b804bd35cf4068e3a7cd19163c0f8a063852;p=thirdparty%2Flinux.git 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 Reviewed-by: Konrad Dybcio Reviewed-by: David Heidelberg Link: https://lore.kernel.org/r/20251028-dt-zap-shader-v1-2-7eccb823b986@oss.qualcomm.com Signed-off-by: Bjorn Andersson --- diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts index 8abf3e909502f..662722adf20b7 100644 --- 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 83b98bad19dd2..0ee2f4b99fbdb 100644 --- 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 63d2993536ade..971bdb9c3693b 100644 --- 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 eb708ebdb0202..3fe71adf1dbb0 100644 --- 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 493c69e991746..45e9dda007cec 100644 --- 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 f0ae0159f32a0..238471267e1fe 100644 --- 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 f3f4c0900572a..f3ff0b3352bcf 100644 --- 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 7480c8d7ac5b7..5b30ace99579d 100644 --- 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 1c50a0563bc47..26f0900513169 100644 --- 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 1c3a7371a2d37..8c90f652afff2 100644 --- 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 117cc0133363b..57afb35770058 100644 --- 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 90efbb7e3799b..35121cbcd37b0 100644 --- 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"; }; };