* [PATCH 1/7] arm64: dts: qcom: sdm670: create common zap-shader node
2025-10-28 20:59 [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node Dmitry Baryshkov
@ 2025-10-28 21:00 ` Dmitry Baryshkov
2025-10-30 10:57 ` Konrad Dybcio
2025-10-28 21:00 ` [PATCH 2/7] arm64: dts: qcom: sdm845: " Dmitry Baryshkov
` (8 subsequent siblings)
9 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2025-10-28 21:00 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
In order to reduce duplication, move common GPU memory configuration
from individual board files to sdm670.dtsi.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 1 -
arch/arm64/boot/dts/qcom/sdm670.dtsi | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts b/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts
index d01422844fbfdec6b4944378a16d9458a4c00bba..760f21f19ca472d620ab1a0703de6e0d69237b55 100644
--- a/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts
+++ b/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts
@@ -406,7 +406,6 @@ &gpu {
status = "okay";
zap-shader {
- memory-region = <&gpu_mem>;
firmware-name = "qcom/sdm670/sargo/a615_zap.mbn";
};
};
diff --git a/arch/arm64/boot/dts/qcom/sdm670.dtsi b/arch/arm64/boot/dts/qcom/sdm670.dtsi
index c3264a31bccf25fca9eae7fa7734ff43c9db410a..57a3ffedc432b08aa7d7918c9bd0f9714dbb3951 100644
--- a/arch/arm64/boot/dts/qcom/sdm670.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm670.dtsi
@@ -1382,6 +1382,10 @@ gpu: gpu@5000000 {
status = "disabled";
+ zap-shader {
+ memory-region = <&gpu_mem>;
+ };
+
gpu_opp_table: opp-table {
compatible = "operating-points-v2";
--
2.47.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 1/7] arm64: dts: qcom: sdm670: create common zap-shader node
2025-10-28 21:00 ` [PATCH 1/7] arm64: dts: qcom: sdm670: create common " Dmitry Baryshkov
@ 2025-10-30 10:57 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2025-10-30 10:57 UTC (permalink / raw)
To: Dmitry Baryshkov, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
On 10/28/25 10:00 PM, Dmitry Baryshkov wrote:
> In order to reduce duplication, move common GPU memory configuration
> from individual board files to sdm670.dtsi.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Konrad
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 2/7] arm64: dts: qcom: sdm845: create common zap-shader node
2025-10-28 20:59 [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node Dmitry Baryshkov
2025-10-28 21:00 ` [PATCH 1/7] arm64: dts: qcom: sdm670: create common " Dmitry Baryshkov
@ 2025-10-28 21:00 ` Dmitry Baryshkov
2025-10-30 10:57 ` Konrad Dybcio
2025-10-28 21:00 ` [PATCH 3/7] arm64: dts: qcom: sc8180x: " Dmitry Baryshkov
` (7 subsequent siblings)
9 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2025-10-28 21:00 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
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>
---
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 1 -
arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 4 ----
arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 1 -
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 1 -
arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts | 1 -
arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 1 -
arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 1 -
arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 1 -
arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 1 -
arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++++
arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 1 -
arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 1 -
12 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index 8abf3e909502f3c3b82c0ca3d7509fdaf23d882c..662722adf20b7d1b6a44a28ba3bbf6b3e373cd0d 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -456,7 +456,6 @@ &gpi_dma1 {
&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
--- a/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi
@@ -456,10 +456,6 @@ &gcc {
&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
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -418,7 +418,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-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index eb708ebdb0202c7e453bd01124166dd050de8d28..3fe71adf1dbb0f05fc4aa0d0bf4d0c6bf14af6e4 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 @@ &gpu {
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
--- a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
@@ -253,7 +253,6 @@ &gpu {
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
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -425,7 +425,6 @@ &gpu {
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
--- 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 @@ &gpu {
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
--- 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 @@ &gpu {
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
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
@@ -394,7 +394,6 @@ &gpu {
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
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -4902,6 +4902,10 @@ gpu: gpu@5000000 {
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
--- 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 @@ &gpu {
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
--- 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 @@ &gcc {
&gpu {
status = "okay";
zap-shader {
- memory-region = <&gpu_mem>;
firmware-name = "qcom/sdm850/LENOVO/81JL/qcdxkmsuc850.mbn";
};
};
--
2.47.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 2/7] arm64: dts: qcom: sdm845: create common zap-shader node
2025-10-28 21:00 ` [PATCH 2/7] arm64: dts: qcom: sdm845: " Dmitry Baryshkov
@ 2025-10-30 10:57 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2025-10-30 10:57 UTC (permalink / raw)
To: Dmitry Baryshkov, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
On 10/28/25 10:00 PM, Dmitry Baryshkov wrote:
> 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>
Konrad
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 3/7] arm64: dts: qcom: sc8180x: create common zap-shader node
2025-10-28 20:59 [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node Dmitry Baryshkov
2025-10-28 21:00 ` [PATCH 1/7] arm64: dts: qcom: sdm670: create common " Dmitry Baryshkov
2025-10-28 21:00 ` [PATCH 2/7] arm64: dts: qcom: sdm845: " Dmitry Baryshkov
@ 2025-10-28 21:00 ` Dmitry Baryshkov
2025-10-30 10:58 ` Konrad Dybcio
2025-10-28 21:00 ` [PATCH 4/7] arm64: dts: qcom: sc8280xp: " Dmitry Baryshkov
` (6 subsequent siblings)
9 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2025-10-28 21:00 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
In order to reduce duplication, move common GPU memory configuration
from individual board files to sc8180x.dtsi.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 6 ------
arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 3 ++-
arch/arm64/boot/dts/qcom/sc8180x.dtsi | 9 +++++++++
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
index 08d0784d0cbb899b021198bd85e26f1a93861713..625a155a584ae4ca14c6f373ef21b773ea7311cb 100644
--- a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
+++ b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
@@ -151,11 +151,6 @@ adsp_mem: adsp-region@90800000 {
no-map;
};
- gpu_mem: gpu-region@98715000 {
- reg = <0x0 0x98715000 0x0 0x2000>;
- no-map;
- };
-
cdsp_mem: cdsp-region@98900000 {
reg = <0x0 0x98900000 0x0 0x1400000>;
no-map;
@@ -357,7 +352,6 @@ &gpu {
status = "okay";
zap-shader {
- memory-region = <&gpu_mem>;
firmware-name = "qcom/sc8180x/LENOVO/82AK/qcdxkmsuc8180.mbn";
};
};
diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
index 93de9fe918ebdadf239832db647b84ac9d5a33f6..069953dcad378448800d45e14931efe1fe1a69fc 100644
--- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
+++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
@@ -14,6 +14,8 @@
#include "sc8180x.dtsi"
#include "sc8180x-pmics.dtsi"
+/delete-node/ &gpu_mem;
+
/ {
model = "Qualcomm SC8180x Primus";
compatible = "qcom,sc8180x-primus", "qcom,sc8180x";
@@ -444,7 +446,6 @@ &gpu {
status = "okay";
zap-shader {
- memory-region = <&gpu_mem>;
firmware-name = "qcom/sc8180x/qcdxkmsuc8180.mbn";
};
};
diff --git a/arch/arm64/boot/dts/qcom/sc8180x.dtsi b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
index e3143a4a41c948cf4ddbf4b137a1323366566fdc..42ab76d52ae21c39d5855e20e11f9cb2319f3afa 100644
--- a/arch/arm64/boot/dts/qcom/sc8180x.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
@@ -646,6 +646,11 @@ reserved@89b00000 {
no-map;
};
+ gpu_mem: memory@98715000 {
+ reg = <0x0 0x98715000 0x0 0x2000>;
+ no-map;
+ };
+
reserved@9d400000 {
reg = <0x0 0x9d400000 0x0 0x1000000>;
no-map;
@@ -2274,6 +2279,10 @@ gpu: gpu@2c00000 {
status = "disabled";
+ zap-shader {
+ memory-region = <&gpu_mem>;
+ };
+
gpu_opp_table: opp-table {
compatible = "operating-points-v2";
--
2.47.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 3/7] arm64: dts: qcom: sc8180x: create common zap-shader node
2025-10-28 21:00 ` [PATCH 3/7] arm64: dts: qcom: sc8180x: " Dmitry Baryshkov
@ 2025-10-30 10:58 ` Konrad Dybcio
2025-10-30 10:59 ` Konrad Dybcio
0 siblings, 1 reply; 29+ messages in thread
From: Konrad Dybcio @ 2025-10-30 10:58 UTC (permalink / raw)
To: Dmitry Baryshkov, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
On 10/28/25 10:00 PM, Dmitry Baryshkov wrote:
> In order to reduce duplication, move common GPU memory configuration
> from individual board files to sc8180x.dtsi.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
[...]
> diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> index 93de9fe918ebdadf239832db647b84ac9d5a33f6..069953dcad378448800d45e14931efe1fe1a69fc 100644
> --- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> @@ -14,6 +14,8 @@
> #include "sc8180x.dtsi"
> #include "sc8180x-pmics.dtsi"
>
> +/delete-node/ &gpu_mem;
> +
> / {
> model = "Qualcomm SC8180x Primus";
> compatible = "qcom,sc8180x-primus", "qcom,sc8180x";
> @@ -444,7 +446,6 @@ &gpu {
> status = "okay";
>
> zap-shader {
> - memory-region = <&gpu_mem>;
Hm?
Konrad
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH 3/7] arm64: dts: qcom: sc8180x: create common zap-shader node
2025-10-30 10:58 ` Konrad Dybcio
@ 2025-10-30 10:59 ` Konrad Dybcio
2025-10-30 17:28 ` Bjorn Andersson
0 siblings, 1 reply; 29+ messages in thread
From: Konrad Dybcio @ 2025-10-30 10:59 UTC (permalink / raw)
To: Dmitry Baryshkov, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
On 10/30/25 11:58 AM, Konrad Dybcio wrote:
> On 10/28/25 10:00 PM, Dmitry Baryshkov wrote:
>> In order to reduce duplication, move common GPU memory configuration
>> from individual board files to sc8180x.dtsi.
>>
>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
>> ---
>
> [...]
>
>> diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
>> index 93de9fe918ebdadf239832db647b84ac9d5a33f6..069953dcad378448800d45e14931efe1fe1a69fc 100644
>> --- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
>> +++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
>> @@ -14,6 +14,8 @@
>> #include "sc8180x.dtsi"
>> #include "sc8180x-pmics.dtsi"
>>
>> +/delete-node/ &gpu_mem;
>> +
>> / {
>> model = "Qualcomm SC8180x Primus";
>> compatible = "qcom,sc8180x-primus", "qcom,sc8180x";
>> @@ -444,7 +446,6 @@ &gpu {
>> status = "okay";
>>
>> zap-shader {
>> - memory-region = <&gpu_mem>;
>
> Hm?
I "hm"d at the wrong line.. why are we delete-node-ing gpu_mem?
Konrad
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH 3/7] arm64: dts: qcom: sc8180x: create common zap-shader node
2025-10-30 10:59 ` Konrad Dybcio
@ 2025-10-30 17:28 ` Bjorn Andersson
2025-10-30 17:50 ` Dmitry Baryshkov
2025-10-30 17:58 ` Dmitry Baryshkov
0 siblings, 2 replies; 29+ messages in thread
From: Bjorn Andersson @ 2025-10-30 17:28 UTC (permalink / raw)
To: Konrad Dybcio
Cc: Dmitry Baryshkov, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers, linux-arm-msm, devicetree,
linux-kernel
On Thu, Oct 30, 2025 at 11:59:00AM +0100, Konrad Dybcio wrote:
> On 10/30/25 11:58 AM, Konrad Dybcio wrote:
> > On 10/28/25 10:00 PM, Dmitry Baryshkov wrote:
> >> In order to reduce duplication, move common GPU memory configuration
> >> from individual board files to sc8180x.dtsi.
> >>
> >> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> >> ---
> >
> > [...]
> >
> >> diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> >> index 93de9fe918ebdadf239832db647b84ac9d5a33f6..069953dcad378448800d45e14931efe1fe1a69fc 100644
> >> --- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> >> +++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> >> @@ -14,6 +14,8 @@
> >> #include "sc8180x.dtsi"
> >> #include "sc8180x-pmics.dtsi"
> >>
> >> +/delete-node/ &gpu_mem;
I agree with your hmm, seems this line should be dropped(?)
Dmitry, please confirm and I can fix it up as I'm applying the series.
Regards,
Bjorn
> >> +
> >> / {
> >> model = "Qualcomm SC8180x Primus";
> >> compatible = "qcom,sc8180x-primus", "qcom,sc8180x";
> >> @@ -444,7 +446,6 @@ &gpu {
> >> status = "okay";
> >>
> >> zap-shader {
> >> - memory-region = <&gpu_mem>;
> >
> > Hm?
>
> I "hm"d at the wrong line.. why are we delete-node-ing gpu_mem?
>
> Konrad
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH 3/7] arm64: dts: qcom: sc8180x: create common zap-shader node
2025-10-30 17:28 ` Bjorn Andersson
@ 2025-10-30 17:50 ` Dmitry Baryshkov
2025-10-30 17:58 ` Dmitry Baryshkov
1 sibling, 0 replies; 29+ messages in thread
From: Dmitry Baryshkov @ 2025-10-30 17:50 UTC (permalink / raw)
To: Bjorn Andersson
Cc: Konrad Dybcio, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers, linux-arm-msm, devicetree,
linux-kernel
On Thu, 30 Oct 2025 at 19:25, Bjorn Andersson <andersson@kernel.org> wrote:
>
> On Thu, Oct 30, 2025 at 11:59:00AM +0100, Konrad Dybcio wrote:
> > On 10/30/25 11:58 AM, Konrad Dybcio wrote:
> > > On 10/28/25 10:00 PM, Dmitry Baryshkov wrote:
> > >> In order to reduce duplication, move common GPU memory configuration
> > >> from individual board files to sc8180x.dtsi.
> > >>
> > >> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> > >> ---
> > >
> > > [...]
> > >
> > >> diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> > >> index 93de9fe918ebdadf239832db647b84ac9d5a33f6..069953dcad378448800d45e14931efe1fe1a69fc 100644
> > >> --- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> > >> +++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> > >> @@ -14,6 +14,8 @@
> > >> #include "sc8180x.dtsi"
> > >> #include "sc8180x-pmics.dtsi"
> > >>
> > >> +/delete-node/ &gpu_mem;
>
> I agree with your hmm, seems this line should be dropped(?)
>
> Dmitry, please confirm and I can fix it up as I'm applying the series.
>
> Regards,
> Bjorn
>
> > >> +
> > >> / {
> > >> model = "Qualcomm SC8180x Primus";
> > >> compatible = "qcom,sc8180x-primus", "qcom,sc8180x";
> > >> @@ -444,7 +446,6 @@ &gpu {
> > >> status = "okay";
> > >>
> > >> zap-shader {
> > >> - memory-region = <&gpu_mem>;
> > >
> > > Hm?
> >
> > I "hm"d at the wrong line.. why are we delete-node-ing gpu_mem?
Because it's a part of the sc8180x.dtsi now. There is no need to have it here.
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH 3/7] arm64: dts: qcom: sc8180x: create common zap-shader node
2025-10-30 17:28 ` Bjorn Andersson
2025-10-30 17:50 ` Dmitry Baryshkov
@ 2025-10-30 17:58 ` Dmitry Baryshkov
2025-10-30 18:45 ` Bjorn Andersson
1 sibling, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2025-10-30 17:58 UTC (permalink / raw)
To: Bjorn Andersson
Cc: Konrad Dybcio, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers, linux-arm-msm, devicetree,
linux-kernel
On Thu, Oct 30, 2025 at 12:28:31PM -0500, Bjorn Andersson wrote:
> On Thu, Oct 30, 2025 at 11:59:00AM +0100, Konrad Dybcio wrote:
> > On 10/30/25 11:58 AM, Konrad Dybcio wrote:
> > > On 10/28/25 10:00 PM, Dmitry Baryshkov wrote:
> > >> In order to reduce duplication, move common GPU memory configuration
> > >> from individual board files to sc8180x.dtsi.
> > >>
> > >> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> > >> ---
> > >
> > > [...]
> > >
> > >> diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> > >> index 93de9fe918ebdadf239832db647b84ac9d5a33f6..069953dcad378448800d45e14931efe1fe1a69fc 100644
> > >> --- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> > >> +++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> > >> @@ -14,6 +14,8 @@
> > >> #include "sc8180x.dtsi"
> > >> #include "sc8180x-pmics.dtsi"
> > >>
> > >> +/delete-node/ &gpu_mem;
>
> I agree with your hmm, seems this line should be dropped(?)
>
> Dmitry, please confirm and I can fix it up as I'm applying the series.
Oh, and this line is necessary, because sc8180x-primus has its own
location for the gpu_mem.
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 3/7] arm64: dts: qcom: sc8180x: create common zap-shader node
2025-10-30 17:58 ` Dmitry Baryshkov
@ 2025-10-30 18:45 ` Bjorn Andersson
2025-10-31 9:30 ` Konrad Dybcio
0 siblings, 1 reply; 29+ messages in thread
From: Bjorn Andersson @ 2025-10-30 18:45 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Konrad Dybcio, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers, linux-arm-msm, devicetree,
linux-kernel
On Thu, Oct 30, 2025 at 07:58:46PM +0200, Dmitry Baryshkov wrote:
> On Thu, Oct 30, 2025 at 12:28:31PM -0500, Bjorn Andersson wrote:
> > On Thu, Oct 30, 2025 at 11:59:00AM +0100, Konrad Dybcio wrote:
> > > On 10/30/25 11:58 AM, Konrad Dybcio wrote:
> > > > On 10/28/25 10:00 PM, Dmitry Baryshkov wrote:
> > > >> In order to reduce duplication, move common GPU memory configuration
> > > >> from individual board files to sc8180x.dtsi.
> > > >>
> > > >> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> > > >> ---
> > > >
> > > > [...]
> > > >
> > > >> diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> > > >> index 93de9fe918ebdadf239832db647b84ac9d5a33f6..069953dcad378448800d45e14931efe1fe1a69fc 100644
> > > >> --- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> > > >> +++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> > > >> @@ -14,6 +14,8 @@
> > > >> #include "sc8180x.dtsi"
> > > >> #include "sc8180x-pmics.dtsi"
> > > >>
> > > >> +/delete-node/ &gpu_mem;
> >
> > I agree with your hmm, seems this line should be dropped(?)
> >
> > Dmitry, please confirm and I can fix it up as I'm applying the series.
>
> Oh, and this line is necessary, because sc8180x-primus has its own
> location for the gpu_mem.
>
Hmm, you're right, not sure why the memory map differs... But this looks
good then.
Regards,
Bjorn
>
> --
> With best wishes
> Dmitry
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 3/7] arm64: dts: qcom: sc8180x: create common zap-shader node
2025-10-30 18:45 ` Bjorn Andersson
@ 2025-10-31 9:30 ` Konrad Dybcio
2025-11-01 17:04 ` Bjorn Andersson
0 siblings, 1 reply; 29+ messages in thread
From: Konrad Dybcio @ 2025-10-31 9:30 UTC (permalink / raw)
To: Bjorn Andersson, Dmitry Baryshkov
Cc: Konrad Dybcio, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
cros-qcom-dts-watchers, linux-arm-msm, devicetree, linux-kernel
On 10/30/25 7:45 PM, Bjorn Andersson wrote:
> On Thu, Oct 30, 2025 at 07:58:46PM +0200, Dmitry Baryshkov wrote:
>> On Thu, Oct 30, 2025 at 12:28:31PM -0500, Bjorn Andersson wrote:
>>> On Thu, Oct 30, 2025 at 11:59:00AM +0100, Konrad Dybcio wrote:
>>>> On 10/30/25 11:58 AM, Konrad Dybcio wrote:
>>>>> On 10/28/25 10:00 PM, Dmitry Baryshkov wrote:
>>>>>> In order to reduce duplication, move common GPU memory configuration
>>>>>> from individual board files to sc8180x.dtsi.
>>>>>>
>>>>>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
>>>>>> ---
>>>>>
>>>>> [...]
>>>>>
>>>>>> diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
>>>>>> index 93de9fe918ebdadf239832db647b84ac9d5a33f6..069953dcad378448800d45e14931efe1fe1a69fc 100644
>>>>>> --- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
>>>>>> +++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
>>>>>> @@ -14,6 +14,8 @@
>>>>>> #include "sc8180x.dtsi"
>>>>>> #include "sc8180x-pmics.dtsi"
>>>>>>
>>>>>> +/delete-node/ &gpu_mem;
>>>
>>> I agree with your hmm, seems this line should be dropped(?)
>>>
>>> Dmitry, please confirm and I can fix it up as I'm applying the series.
>>
>> Oh, and this line is necessary, because sc8180x-primus has its own
>> location for the gpu_mem.
>>
>
> Hmm, you're right, not sure why the memory map differs... But this looks
> good then.
The latest memory map for 8180 says:
GPU micro-code @ 0x98715000, 0x2000-long
(matching the Flex 5G)
Across all the revisions, Primus's range is either part of a
"reserved" region, or the CDSP's memory.
So it's either wrong or OEM-modified, with the latter being rather
an odd thing given it's a CRD..
Konrad
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 3/7] arm64: dts: qcom: sc8180x: create common zap-shader node
2025-10-31 9:30 ` Konrad Dybcio
@ 2025-11-01 17:04 ` Bjorn Andersson
0 siblings, 0 replies; 29+ messages in thread
From: Bjorn Andersson @ 2025-11-01 17:04 UTC (permalink / raw)
To: Konrad Dybcio
Cc: Dmitry Baryshkov, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers, linux-arm-msm, devicetree,
linux-kernel
On Fri, Oct 31, 2025 at 10:30:17AM +0100, Konrad Dybcio wrote:
> On 10/30/25 7:45 PM, Bjorn Andersson wrote:
> > On Thu, Oct 30, 2025 at 07:58:46PM +0200, Dmitry Baryshkov wrote:
> >> On Thu, Oct 30, 2025 at 12:28:31PM -0500, Bjorn Andersson wrote:
> >>> On Thu, Oct 30, 2025 at 11:59:00AM +0100, Konrad Dybcio wrote:
> >>>> On 10/30/25 11:58 AM, Konrad Dybcio wrote:
> >>>>> On 10/28/25 10:00 PM, Dmitry Baryshkov wrote:
> >>>>>> In order to reduce duplication, move common GPU memory configuration
> >>>>>> from individual board files to sc8180x.dtsi.
> >>>>>>
> >>>>>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> >>>>>> ---
> >>>>>
> >>>>> [...]
> >>>>>
> >>>>>> diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> >>>>>> index 93de9fe918ebdadf239832db647b84ac9d5a33f6..069953dcad378448800d45e14931efe1fe1a69fc 100644
> >>>>>> --- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> >>>>>> +++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
> >>>>>> @@ -14,6 +14,8 @@
> >>>>>> #include "sc8180x.dtsi"
> >>>>>> #include "sc8180x-pmics.dtsi"
> >>>>>>
> >>>>>> +/delete-node/ &gpu_mem;
> >>>
> >>> I agree with your hmm, seems this line should be dropped(?)
> >>>
> >>> Dmitry, please confirm and I can fix it up as I'm applying the series.
> >>
> >> Oh, and this line is necessary, because sc8180x-primus has its own
> >> location for the gpu_mem.
> >>
> >
> > Hmm, you're right, not sure why the memory map differs... But this looks
> > good then.
>
> The latest memory map for 8180 says:
>
> GPU micro-code @ 0x98715000, 0x2000-long
> (matching the Flex 5G)
>
> Across all the revisions, Primus's range is either part of a
> "reserved" region, or the CDSP's memory.
>
> So it's either wrong or OEM-modified, with the latter being rather
> an odd thing given it's a CRD..
>
I have a faint memory of having issues placing that region, so I might
be that I just winged it on the primus...
Perhaps it doesn't need to be different, if so that's a separate change.
Regards,
Bjorn
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 4/7] arm64: dts: qcom: sc8280xp: create common zap-shader node
2025-10-28 20:59 [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node Dmitry Baryshkov
` (2 preceding siblings ...)
2025-10-28 21:00 ` [PATCH 3/7] arm64: dts: qcom: sc8180x: " Dmitry Baryshkov
@ 2025-10-28 21:00 ` Dmitry Baryshkov
2025-10-30 10:59 ` Konrad Dybcio
2025-10-28 21:00 ` [PATCH 5/7] arm64: dts: qcom: sm8250: drop duplicate memory-region defs Dmitry Baryshkov
` (5 subsequent siblings)
9 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2025-10-28 21:00 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
In order to reduce duplication, mMove common GPU memory configuration
from individual board files to sc8280xp.dtsi.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 8 --------
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 6 ------
arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 6 ------
arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 6 ------
arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts | 6 ------
arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts | 6 ------
arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 9 +++++++++
7 files changed, 9 insertions(+), 38 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
index 64e59299672cbf316b4eddb978e4583ff34c0299..524d44cbae740577e010f156308a715962db1a36 100644
--- a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
+++ b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
@@ -149,13 +149,6 @@ regulator-usb5-vbus {
enable-active-high;
regulator-always-on;
};
-
- reserved-memory {
- gpu_mem: gpu-mem@8bf00000 {
- reg = <0 0x8bf00000 0 0x2000>;
- no-map;
- };
- };
};
&apps_rsc {
@@ -347,7 +340,6 @@ &gpu {
status = "okay";
zap-shader {
- memory-region = <&gpu_mem>;
firmware-name = "qcom/sa8295p/a690_zap.mbn";
};
};
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index 490e970c54a24203ab297dfabed7e21c2be244e9..858f71737d93fd8591ba42eb363748ac51699d63 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -225,11 +225,6 @@ vreg_wwan: regulator-wwan {
};
reserved-memory {
- gpu_mem: gpu-mem@8bf00000 {
- reg = <0 0x8bf00000 0 0x2000>;
- no-map;
- };
-
linux,cma {
compatible = "shared-dma-pool";
size = <0x0 0x8000000>;
@@ -511,7 +506,6 @@ &gpu {
status = "okay";
zap-shader {
- memory-region = <&gpu_mem>;
firmware-name = "qcom/sc8280xp/qcdxkmsuc8280.mbn";
};
};
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts b/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts
index 0374251d33291fc5804c9be0dc649ccea1c1c0e0..69d0d6c12e58653f8cb56cb7d383ad9d64699d18 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts
@@ -158,11 +158,6 @@ vreg_wlan: regulator-wlan {
};
reserved-memory {
- gpu_mem: gpu-mem@8bf00000 {
- reg = <0 0x8bf00000 0 0x2000>;
- no-map;
- };
-
linux,cma {
compatible = "shared-dma-pool";
size = <0x0 0x8000000>;
@@ -602,7 +597,6 @@ &gpu {
status = "okay";
zap-shader {
- memory-region = <&gpu_mem>;
firmware-name = "qcom/sc8280xp/HUAWEI/gaokun3/qcdxkmsuc8280.mbn";
};
};
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index 637430719e6d7d3c0eeb4abf2b80eea1f8289530..87bb42d9cc327a1d1811f15605a369dc8760557d 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -283,11 +283,6 @@ vreg_wwan: regulator-wwan {
};
reserved-memory {
- gpu_mem: gpu-mem@8bf00000 {
- reg = <0 0x8bf00000 0 0x2000>;
- no-map;
- };
-
linux,cma {
compatible = "shared-dma-pool";
size = <0x0 0x8000000>;
@@ -724,7 +719,6 @@ &gpu {
status = "okay";
zap-shader {
- memory-region = <&gpu_mem>;
firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn";
};
};
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts
index aeed3ef152eba0fff13f8fc150f32974bffbe8e8..ea50e370f69837ec9412efc17e2a41034b0736fd 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts
@@ -186,11 +186,6 @@ vreg_wwan: regulator-wwan {
};
reserved-memory {
- gpu_mem: gpu-mem@8bf00000 {
- reg = <0 0x8bf00000 0 0x2000>;
- no-map;
- };
-
linux,cma {
compatible = "shared-dma-pool";
size = <0x0 0x8000000>;
@@ -464,7 +459,6 @@ &gpu {
status = "okay";
zap-shader {
- memory-region = <&gpu_mem>;
firmware-name = "qcom/sc8280xp/MICROSOFT/SurfacePro9/qcdxkmsuc8280.mbn";
};
};
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
index a40dccd70dfda873fb963b71e39617a2025b86db..48b60f6186fc1d69178902f2cc3bee324144202c 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
@@ -227,11 +227,6 @@ vreg_wwan: regulator-wwan {
};
reserved-memory {
- gpu_mem: gpu-mem@8bf00000 {
- reg = <0 0x8bf00000 0 0x2000>;
- no-map;
- };
-
linux,cma {
compatible = "shared-dma-pool";
size = <0x0 0x8000000>;
@@ -581,7 +576,6 @@ &gpu {
status = "okay";
zap-shader {
- memory-region = <&gpu_mem>;
firmware-name = "qcom/sc8280xp/microsoft/blackrock/qcdxkmsuc8280.mbn";
};
};
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index 7b89d3d422ea62012daeb423e457a20e84eeb0b5..b7044b9d656e4991e737f7008a7cf8f0619dd115 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -691,6 +691,11 @@ reserved-region@85b00000 {
no-map;
};
+ pil_gpu_mem: gpu-mem@8bf00000 {
+ reg = <0 0x8bf00000 0 0x2000>;
+ no-map;
+ };
+
pil_adsp_mem: adsp-region@86c00000 {
reg = <0 0x86c00000 0 0x2000000>;
no-map;
@@ -3366,6 +3371,10 @@ gpu: gpu@3d00000 {
status = "disabled";
+ zap-shader {
+ memory-region = <&pil_gpu_mem>;
+ };
+
gpu_opp_table: opp-table {
compatible = "operating-points-v2";
--
2.47.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 4/7] arm64: dts: qcom: sc8280xp: create common zap-shader node
2025-10-28 21:00 ` [PATCH 4/7] arm64: dts: qcom: sc8280xp: " Dmitry Baryshkov
@ 2025-10-30 10:59 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2025-10-30 10:59 UTC (permalink / raw)
To: Dmitry Baryshkov, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
On 10/28/25 10:00 PM, Dmitry Baryshkov wrote:
> In order to reduce duplication, mMove common GPU memory configuration
> from individual board files to sc8280xp.dtsi.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Konrad
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 5/7] arm64: dts: qcom: sm8250: drop duplicate memory-region defs
2025-10-28 20:59 [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node Dmitry Baryshkov
` (3 preceding siblings ...)
2025-10-28 21:00 ` [PATCH 4/7] arm64: dts: qcom: sc8280xp: " Dmitry Baryshkov
@ 2025-10-28 21:00 ` Dmitry Baryshkov
2025-10-30 10:59 ` Konrad Dybcio
2025-10-28 21:00 ` [PATCH 6/7] arm64: dts: qcom: sc7180: add gpu_zap_shader label Dmitry Baryshkov
` (4 subsequent siblings)
9 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2025-10-28 21:00 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
The base file, sm8250.dtsi, alread includes memory-region under the
GPU's zap-shader node. Drop duplicates from the individual board files.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 1 -
arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 1 -
arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 1 -
arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts | 1 -
4 files changed, 4 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
index d99448a0732d9d165be1b5a1b1e15b2424b98b55..964e33b6e74aee9582d8eba32f976c6998d36c68 100644
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
@@ -596,7 +596,6 @@ &gpu {
status = "okay";
zap-shader {
- memory-region = <&gpu_mem>;
firmware-name = "qcom/sm8250/a650_zap.mbn";
};
};
diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
index 7f592bd3024868c6ab4c9c61051d3f2cf5707a1a..5c40d4e869d354870828629238d6e14364f438aa 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
@@ -486,7 +486,6 @@ &gpu {
status = "okay";
zap-shader {
- memory-region = <&gpu_mem>;
firmware-name = "qcom/sm8250/a650_zap.mbn";
};
};
diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
index 465fd6e954a347acf15ef3199afd8d1a198f95e8..6c9bb993dc2a3d12b1c7972128e2a2f64fa8dfab 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
@@ -556,7 +556,6 @@ &gpu {
status = "okay";
zap-shader {
- memory-region = <&gpu_mem>;
firmware-name = "qcom/sm8250/xiaomi/elish/a650_zap.mbn";
};
};
diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts
index 4ad24974c09f9bb75cc24e55bd4869b52a39ac7c..12565ad87890fea1cc6c25cc161072d75b793c1d 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts
@@ -426,7 +426,6 @@ &gpu {
status = "okay";
zap-shader {
- memory-region = <&gpu_mem>;
firmware-name = "qcom/sm8250/xiaomi/pipa/a650_zap.mbn";
};
};
--
2.47.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 5/7] arm64: dts: qcom: sm8250: drop duplicate memory-region defs
2025-10-28 21:00 ` [PATCH 5/7] arm64: dts: qcom: sm8250: drop duplicate memory-region defs Dmitry Baryshkov
@ 2025-10-30 10:59 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2025-10-30 10:59 UTC (permalink / raw)
To: Dmitry Baryshkov, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
On 10/28/25 10:00 PM, Dmitry Baryshkov wrote:
> The base file, sm8250.dtsi, alread includes memory-region under the
> GPU's zap-shader node. Drop duplicates from the individual board files.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Konrad
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 6/7] arm64: dts: qcom: sc7180: add gpu_zap_shader label
2025-10-28 20:59 [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node Dmitry Baryshkov
` (4 preceding siblings ...)
2025-10-28 21:00 ` [PATCH 5/7] arm64: dts: qcom: sm8250: drop duplicate memory-region defs Dmitry Baryshkov
@ 2025-10-28 21:00 ` Dmitry Baryshkov
2025-10-30 11:03 ` Konrad Dybcio
2025-10-28 21:00 ` [PATCH 7/7] arm64: dts: qcom: " Dmitry Baryshkov
` (3 subsequent siblings)
9 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2025-10-28 21:00 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
Patching existing DT nodes based on full path is error prone and
generally not recommended. Add a generic zap-shader subnode to the GPU
node on SC7180, delete it on trogdor and IDP, two platforms which don't
use ZAP and patch it with the firmware-name on all other platforms by
using the label.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 9 ++++-----
arch/arm64/boot/dts/qcom/sc7180-el2.dtso | 6 ++----
arch/arm64/boot/dts/qcom/sc7180-idp.dts | 1 +
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 +
arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 ++++
5 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
index ad342d8b7508c543984f166300bea04b6d7de88f..1514da636269826ce3e87d8c23aad0e37430f57d 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts
@@ -31,7 +31,7 @@ chosen {
};
reserved-memory {
- zap_mem: zap-shader@80840000 {
+ gpu_mem: zap-shader@80840000 {
reg = <0x0 0x80840000 0 0x2000>;
no-map;
};
@@ -426,11 +426,10 @@ panel_in_edp: endpoint {
&gpu {
status = "okay";
+};
- zap-shader {
- memory-region = <&zap_mem>;
- firmware-name = "qcom/sc7180/acer/aspire1/qcdxkmsuc7180.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sc7180/acer/aspire1/qcdxkmsuc7180.mbn";
};
&mdss {
diff --git a/arch/arm64/boot/dts/qcom/sc7180-el2.dtso b/arch/arm64/boot/dts/qcom/sc7180-el2.dtso
index 49a98676ca4db270ecb55e8f801d0800ef9e4def..6e8da59597b657cf15c68c3a12ab56213979950b 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-el2.dtso
+++ b/arch/arm64/boot/dts/qcom/sc7180-el2.dtso
@@ -8,10 +8,8 @@
/plugin/;
/* We can't and don't need to use zap shader in EL2 as linux can zap the gpu on it's own. */
-&gpu {
- zap-shader {
- status = "disabled";
- };
+&gpu_zap_shader {
+ status = "disabled";
};
/* Venus can be used in EL2 if booted similarly to ChromeOS devices. */
diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
index 19cf419cf531f353f17b83b89ec57dac697d5134..0bce3eefca2e9b14310390f49616873689894ae3 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
@@ -39,6 +39,7 @@ chosen {
*
*/
+/delete-node/ &gpu_zap_shader;
/delete-node/ &hyp_mem;
/delete-node/ &xbl_mem;
/delete-node/ &aop_mem;
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 74ab321d3333cf8fdca45c7cde2fcd9d34b264b2..b398f69917f0e1eb7f2b1b0a6cb582ecb0c7c5c9 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -41,6 +41,7 @@ charger-crit {
* required by the board dts.
*/
+/delete-node/ &gpu_zap_shader;
/delete-node/ &hyp_mem;
/delete-node/ &ipa_fw_mem;
/delete-node/ &xbl_mem;
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index a47182994c564e036dba25c772454320dc41cc7c..45b9864e3304b2c0331a27109f7918c327cee5c2 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -2185,6 +2185,10 @@ gpu: gpu@5000000 {
interconnects = <&gem_noc MASTER_GFX3D 0 &mc_virt SLAVE_EBI1 0>;
interconnect-names = "gfx-mem";
+ gpu_zap_shader: zap-shader {
+ memory-region = <&gpu_mem>;
+ };
+
gpu_opp_table: opp-table {
compatible = "operating-points-v2";
--
2.47.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 6/7] arm64: dts: qcom: sc7180: add gpu_zap_shader label
2025-10-28 21:00 ` [PATCH 6/7] arm64: dts: qcom: sc7180: add gpu_zap_shader label Dmitry Baryshkov
@ 2025-10-30 11:03 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2025-10-30 11:03 UTC (permalink / raw)
To: Dmitry Baryshkov, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
On 10/28/25 10:00 PM, Dmitry Baryshkov wrote:
> Patching existing DT nodes based on full path is error prone and
this is not a full path reference, although DT unfortunately supports it:
&{/soc@0/foo@cafe/bar@dead/path@1234/pleasedontusethis@321} {}
> generally not recommended. Add a generic zap-shader subnode to the GPU
> node on SC7180, delete it on trogdor and IDP, two platforms which don't
> use ZAP and patch it with the firmware-name on all other platforms by
> using the label.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Konrad
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 7/7] arm64: dts: qcom: add gpu_zap_shader label
2025-10-28 20:59 [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node Dmitry Baryshkov
` (5 preceding siblings ...)
2025-10-28 21:00 ` [PATCH 6/7] arm64: dts: qcom: sc7180: add gpu_zap_shader label Dmitry Baryshkov
@ 2025-10-28 21:00 ` Dmitry Baryshkov
2025-10-30 11:04 ` Konrad Dybcio
2025-10-28 22:21 ` [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node David Heidelberg
` (2 subsequent siblings)
9 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2025-10-28 21:00 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
Patching existing DT nodes based on full path is error prone and
generally not recommended. Follow the pattern introduced in the last
platforms, add gpu_zap_shader label to the ZAP node and use it in the
board files.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 6 +++---
arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts | 6 +++---
arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts | 6 +++---
arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 6 ++----
arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts | 6 ++----
arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts | 6 ++----
arch/arm64/boot/dts/qcom/qcm2290.dtsi | 2 +-
arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 6 +++---
arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 6 +++---
arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 6 +++---
arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 6 +++---
arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 6 +++---
arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 6 +++---
arch/arm64/boot/dts/qcom/sc8180x.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 6 +++---
arch/arm64/boot/dts/qcom/sc8280xp-el2.dtso | 6 ++----
arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 6 +++---
arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 6 +++---
arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts | 6 +++---
arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts | 6 +++---
arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 6 +++---
arch/arm64/boot/dts/qcom/sdm670.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 7 ++++---
arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts | 6 ++----
arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts | 6 ++----
arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 6 +++---
arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 6 +++---
arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts | 6 +++---
arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 6 +++---
arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 6 +++---
arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 6 +++---
arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 6 +++---
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 6 +++---
arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 8 ++++----
arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 6 +++---
arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 6 +++---
arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 6 +++---
arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 6 +++---
arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts | 6 +++---
arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 6 +++---
arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 6 +++---
arch/arm64/boot/dts/qcom/sm8450.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 6 +++---
arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 6 +++---
arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 6 +++---
arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +-
arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 6 +++---
arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 6 +++---
arch/arm64/boot/dts/qcom/sm8650.dtsi | 2 +-
arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 6 +++---
arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 6 +++---
arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 6 +++---
arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 6 +++---
arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts | 6 ++----
arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 6 +++---
arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 8 ++++----
arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 6 +++---
64 files changed, 162 insertions(+), 175 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
index 99658b0bca8461cc3903da9c8c86c898bbf61948..9fa70ff6887b78caf1826f653a5caccd9653269c 100644
--- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
+++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts
@@ -201,10 +201,10 @@ &camss {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/apq8096/a530_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/apq8096/a530_zap.mbn";
};
&hsusb_phy1 {
diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts b/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts
index 220eeb31fdc70b89b3e237d1f6643c465bda5238..0bb9e3d8f7144a853bbde8dd6aecf7b6f63c9cd3 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts
@@ -27,10 +27,10 @@ &battery {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/msm8996/oneplus3/a530_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/msm8996/oneplus3/a530_zap.mbn";
};
&mss_pil {
diff --git a/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts b/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts
index f772618e80c702cb8995965dffbf5992a9f66490..1d7b27c5aff60cfa5fb19d2285d4b8ef96185195 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts
@@ -28,10 +28,10 @@ &battery {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/msm8996/oneplus3t/a530_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/msm8996/oneplus3t/a530_zap.mbn";
};
&mss_pil {
diff --git a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
index bd3f39e1b98fb6360950b646fd05c6b7036dd0d5..3c6a40212a8dce5310d43bbcc5f7b83e7c48a27f 100644
--- a/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts
@@ -91,10 +91,8 @@ synaptics@20 {
};
-&gpu {
- zap-shader {
- firmware-name = "qcom/msm8996/gemini/a530_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/msm8996/gemini/a530_zap.mbn";
};
&mdss_dsi0 {
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index c75b522f6eba66afeb71be5d81624183641bde71..b341dec271930776795a75cdbc481d1f10f0ac2b 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -1333,7 +1333,7 @@ opp-133000000 {
};
};
- zap-shader {
+ gpu_zap_shader: zap-shader {
memory-region = <&gpu_mem>;
};
};
diff --git a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
index 443599a5a5dd573a1ac2a83f64c5016c36d27020..f8ab03f106a1b736d2912409b07e2bcb98e33953 100644
--- a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts
@@ -39,10 +39,8 @@ touchscreen@20 {
};
};
-&gpu {
- zap-shader {
- firmware-name = "qcom/msm8996/natrium/a530_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/msm8996/natrium/a530_zap.mbn";
};
&mdss_dsi0 {
diff --git a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts
index 33d84ac541e1c52028ffa4d86d602e0dc876988f..1cc33c3123a4e0da9fe6beb982b38379eb6844ff 100644
--- a/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts
+++ b/arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts
@@ -91,10 +91,8 @@ touchscreen: atmel-mxt-ts@4a {
};
};
-&gpu {
- zap-shader {
- firmware-name = "qcom/msm8996/scorpio/a530_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/msm8996/scorpio/a530_zap.mbn";
};
&mdp_smmu {
diff --git a/arch/arm64/boot/dts/qcom/qcm2290.dtsi b/arch/arm64/boot/dts/qcom/qcm2290.dtsi
index c6544ffa6f328e901048b3e6bfd516bf11af3901..b909306b3f126f8479cb1a4cd0325b0af1f38787 100644
--- a/arch/arm64/boot/dts/qcom/qcm2290.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcm2290.dtsi
@@ -1625,7 +1625,7 @@ gpu: gpu@5900000 {
status = "disabled";
- zap-shader {
+ gpu_zap_shader: zap-shader {
memory-region = <&pil_gpu_mem>;
};
diff --git a/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts b/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts
index 43af25d17aa8314354b1ecb8617510cdd6c857a3..5cbbdae497d8a29521dece6925ce1f2022a8f9ba 100644
--- a/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts
+++ b/arch/arm64/boot/dts/qcom/qrb2210-rb1.dts
@@ -261,10 +261,10 @@ &gpi_dma0 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/qcm2290/a702_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/qcm2290/a702_zap.mbn";
};
&i2c2_gpio {
diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
index bdf2d66e40c62596b8b024de833835a0750df35d..0cd36c54632fa32353e679193f25a12c6e5c4a49 100644
--- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
+++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts
@@ -245,10 +245,10 @@ &gpi_dma0 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/qrb4210/a610_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/qrb4210/a610_zap.mbn";
};
&i2c2_gpio {
diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
index 964e33b6e74aee9582d8eba32f976c6998d36c68..71b42e76f03d626ef8357ac66ef6c850344a479d 100644
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
@@ -594,10 +594,10 @@ &gmu {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sm8250/a650_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sm8250/a650_zap.mbn";
};
/* LS-I2C0 */
diff --git a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
index 524d44cbae740577e010f156308a715962db1a36..d28d691624279161ab3679308166b1acac2527ea 100644
--- a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
+++ b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
@@ -338,10 +338,10 @@ &gmu {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sa8295p/a690_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sa8295p/a690_zap.mbn";
};
&gpu_smmu {
diff --git a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
index 625a155a584ae4ca14c6f373ef21b773ea7311cb..d86a31ddede29d4ebdad8f1f55bded2343bc14ed 100644
--- a/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
+++ b/arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts
@@ -350,10 +350,10 @@ vreg_l16e_3p0: ldo16 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sc8180x/LENOVO/82AK/qcdxkmsuc8180.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sc8180x/LENOVO/82AK/qcdxkmsuc8180.mbn";
};
&i2c1 {
diff --git a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
index 069953dcad378448800d45e14931efe1fe1a69fc..aff398390eba77c0891cb654f5f8d4938fbff81b 100644
--- a/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
+++ b/arch/arm64/boot/dts/qcom/sc8180x-primus.dts
@@ -444,10 +444,10 @@ vreg_l16e_3p0: ldo16 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sc8180x/qcdxkmsuc8180.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sc8180x/qcdxkmsuc8180.mbn";
};
&i2c1 {
diff --git a/arch/arm64/boot/dts/qcom/sc8180x.dtsi b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
index 42ab76d52ae21c39d5855e20e11f9cb2319f3afa..8319d892c6e490a1a1c35f5558dc8c6d4e71034f 100644
--- a/arch/arm64/boot/dts/qcom/sc8180x.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8180x.dtsi
@@ -2279,7 +2279,7 @@ gpu: gpu@2c00000 {
status = "disabled";
- zap-shader {
+ gpu_zap_shader: zap-shader {
memory-region = <&gpu_mem>;
};
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index 858f71737d93fd8591ba42eb363748ac51699d63..c53e00cae465a6e7f4db4d60e28a0badefb1d912 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -504,10 +504,10 @@ &gpi_dma2 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sc8280xp/qcdxkmsuc8280.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sc8280xp/qcdxkmsuc8280.mbn";
};
&mdss0 {
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-el2.dtso b/arch/arm64/boot/dts/qcom/sc8280xp-el2.dtso
index 25d1fa4bc2055e67db0508aa09c8a8bd7fa01687..cff3735a12dde8eccc45f7fa5166fe163ae5e95f 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-el2.dtso
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-el2.dtso
@@ -8,10 +8,8 @@
/plugin/;
/* We can't and don't need to use zap shader in EL2 as linux can zap the gpu on it's own. */
-&gpu {
- zap-shader {
- status = "disabled";
- };
+&gpu_zap_shader {
+ status = "disabled";
};
/*
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts b/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts
index 69d0d6c12e58653f8cb56cb7d383ad9d64699d18..9819454abe131b6e719ddcb9e84874e5e3e97d63 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts
@@ -595,10 +595,10 @@ &gpi_dma2 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sc8280xp/HUAWEI/gaokun3/qcdxkmsuc8280.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sc8280xp/HUAWEI/gaokun3/qcdxkmsuc8280.mbn";
};
&i2c4 {
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
index 87bb42d9cc327a1d1811f15605a369dc8760557d..fe9b3ebd64593cfbad9f298abfacaf25f5037476 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -717,10 +717,10 @@ &gpi_dma2 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn";
};
&mdss0 {
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts
index ea50e370f69837ec9412efc17e2a41034b0736fd..f2b4470d4407fb5b6a3dbac8bc972c010c31bd06 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts
@@ -457,10 +457,10 @@ &gpi_dma2 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sc8280xp/MICROSOFT/SurfacePro9/qcdxkmsuc8280.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sc8280xp/MICROSOFT/SurfacePro9/qcdxkmsuc8280.mbn";
};
&mdss0 {
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
index 48b60f6186fc1d69178902f2cc3bee324144202c..00bbeeef6f14dd89de506e33742f8f73435ac021 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts
@@ -574,10 +574,10 @@ &gpi_dma2 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sc8280xp/microsoft/blackrock/qcdxkmsuc8280.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sc8280xp/microsoft/blackrock/qcdxkmsuc8280.mbn";
};
&mdss0 {
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index b7044b9d656e4991e737f7008a7cf8f0619dd115..5334adebf278248b68b92c1e8e754f680155dbb3 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -3371,7 +3371,7 @@ gpu: gpu@3d00000 {
status = "disabled";
- zap-shader {
+ gpu_zap_shader: zap-shader {
memory-region = <&pil_gpu_mem>;
};
diff --git a/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts b/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts
index 760f21f19ca472d620ab1a0703de6e0d69237b55..ed55646ca419d79aa2408c5b86f9c43364a6c6ce 100644
--- a/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts
+++ b/arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts
@@ -404,10 +404,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sdm670/sargo/a615_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sdm670/sargo/a615_zap.mbn";
};
&i2c9 {
diff --git a/arch/arm64/boot/dts/qcom/sdm670.dtsi b/arch/arm64/boot/dts/qcom/sdm670.dtsi
index 57a3ffedc432b08aa7d7918c9bd0f9714dbb3951..b8a8dcbdfbe33e72cb259d6a4011fc9b3d6144a8 100644
--- a/arch/arm64/boot/dts/qcom/sdm670.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm670.dtsi
@@ -1382,7 +1382,7 @@ gpu: gpu@5000000 {
status = "disabled";
- zap-shader {
+ gpu_zap_shader: zap-shader {
memory-region = <&gpu_mem>;
};
diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
index 662722adf20b7d1b6a44a28ba3bbf6b3e373cd0d..ce23f87e0316b6bfb50b387f4832cc4c35178071 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts
@@ -455,9 +455,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
- zap-shader {
- firmware-name = "qcom/sdm845/a630_zap.mbn";
- };
+};
+
+&gpu_zap_shader {
+ firmware-name = "qcom/sdm845/a630_zap.mbn";
};
&i2c10 {
diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts b/arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts
index a12723310c8b630a4961de671ea8b60f1f8b512b..09bfcef42402911a3f0081819de23398e35ec973 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts
@@ -47,10 +47,8 @@ &cdsp_pas {
firmware-name = "qcom/sdm845/judyln/cdsp.mbn";
};
-&gpu {
- zap-shader {
- firmware-name = "qcom/sdm845/judyln/a630_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sdm845/judyln/a630_zap.mbn";
};
&mss_pil {
diff --git a/arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts b/arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts
index d17d4d4d56097a73f9f54c0b70bd1b19ac693e64..ffe1da2227f00fbb26a4bf1eb88223136d7851a9 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts
@@ -33,10 +33,8 @@ &cdsp_pas {
firmware-name = "qcom/sdm845/judyp/cdsp.mbn";
};
-&gpu {
- zap-shader {
- firmware-name = "qcom/sdm845/judyp/a630_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sdm845/judyp/a630_zap.mbn";
};
&mss_pil {
diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index 971bdb9c3693bfafab820a5242a82874340b6c4f..091568642faa78c2072cf8a1bc7f6d4ac72eea15 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -416,10 +416,10 @@ &gcc {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sdm845/a630_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sdm845/a630_zap.mbn";
};
&i2c10 {
diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
index 3fe71adf1dbb0f05fc4aa0d0bf4d0c6bf14af6e4..fd7fdc1f0749380c2a1630473839005f17aba63b 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi
@@ -339,10 +339,10 @@ &gcc {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sdm845/oneplus6/a630_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sdm845/oneplus6/a630_zap.mbn";
};
&i2c10 {
diff --git a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
index 45e9dda007cec2500bf5b6990e7d8b1ba56a67c6..5d41a92cfebffe0f843dd387de473f0942f9e5a8 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts
@@ -251,10 +251,10 @@ vib_pwm: pwm {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sdm845/starqltechn/a630_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sdm845/starqltechn/a630_zap.mbn";
};
&mdss {
diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index 238471267e1feace68487aa25f97748704ebb18c..ddc2b3ca3bc576d0548e2ecd43dd16196b81f38d 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -423,10 +423,10 @@ &gcc {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sdm845/axolotl/a630_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sdm845/axolotl/a630_zap.mbn";
};
&i2c5 {
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 f3ff0b3352bcf7c3eccf7ebe615cd2e40cee7847..7dc9349eedfd92199c949b091b6a0ab1c5990318 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi
@@ -426,10 +426,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sdm845/Sony/tama/a630_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sdm845/Sony/tama/a630_zap.mbn";
};
&i2c5 {
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 5b30ace99579d014d762865377d5e9fdd5bab371..785006a15e9795db1605c3bb5a5861142d78458c 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi
@@ -246,10 +246,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sdm845/beryllium/a630_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sdm845/beryllium/a630_zap.mbn";
};
&ibb {
diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
index 26f0900513169368ecfb65b01eedcaf1050e3f53..30e88ff010a39738c5c88ef23899189f5c4dd01a 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts
@@ -392,10 +392,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sdm845/polaris/a630_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sdm845/polaris/a630_zap.mbn";
};
&ibb {
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index 8c90f652afff25a0860ae993e713f94dc9b39f00..bf2f9c04adba7953fde99edea8dbe5f40daec06c 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -4902,7 +4902,7 @@ gpu: gpu@5000000 {
status = "disabled";
- zap-shader {
+ gpu_zap_shader: zap-shader {
memory-region = <&gpu_mem>;
};
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 57afb35770058b84c592db9f20e82ebb7c4f8374..0ef9ea38a424a520362665265a25acf66d1c44b8 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
@@ -488,10 +488,10 @@ &gcc {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sdm850/HUAWEI/AL09/qcdxkmsuc850.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sdm850/HUAWEI/AL09/qcdxkmsuc850.mbn";
};
&i2c5 {
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 35121cbcd37b08029d3e1a12b99fca44f3e4846d..e41200839dbeca2867a3687ad71e622b0b8e0123 100644
--- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
+++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
@@ -356,10 +356,10 @@ &gcc {
};
&gpu {
- status = "okay";
- zap-shader {
- firmware-name = "qcom/sdm850/LENOVO/81JL/qcdxkmsuc850.mbn";
- };
+ status = "okay";};
+
+&gpu_zap_shader {
+ firmware-name = "qcom/sdm850/LENOVO/81JL/qcdxkmsuc850.mbn";
};
&i2c1 {
diff --git a/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts b/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts
index ad347ccd19755b20db8e0de6852148c76010e697..466ad409e9240e5137794597d5af4714bbae7af9 100644
--- a/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts
+++ b/arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts
@@ -121,10 +121,10 @@ &gpi_dma0 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sm6115/Fxtec/QX1050/a610_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sm6115/Fxtec/QX1050/a610_zap.mbn";
};
&i2c1 {
diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi
index 91fc36b59abf96d008ddeb43f3e4b9f0cfd49901..5e2032c26ea388eadf4bf41535ff4b2ebf8e472d 100644
--- a/arch/arm64/boot/dts/qcom/sm6115.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi
@@ -1745,7 +1745,7 @@ gpu: gpu@5900000 {
status = "disabled";
- zap-shader {
+ gpu_zap_shader: zap-shader {
memory-region = <&pil_gpu_mem>;
};
diff --git a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
index c17545111f49a8388d8d5802ea5c3ff3c8a6cb45..be1f550fd7b50b994427395b6d49c63f0b8ff159 100644
--- a/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
+++ b/arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts
@@ -67,10 +67,10 @@ ramoops@ffc00000 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sm6115/LENOVO/J606F/a610_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sm6115/LENOVO/J606F/a610_zap.mbn";
};
&mdss {
diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index 1ea2beb9e2eaccf0e39dd2baea853d0152e48477..e3ec99972a28c8b044ef23cc2d39b3997b856071 100644
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -2255,7 +2255,7 @@ gpu: gpu@2c00000 {
status = "disabled";
- zap-shader {
+ gpu_zap_shader: zap-shader {
memory-region = <&gpu_mem>;
};
diff --git a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
index 5c40d4e869d354870828629238d6e14364f438aa..51779b99176d06a5869e3147a40aa101a990a99a 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-mtp.dts
@@ -484,10 +484,10 @@ &gmu {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sm8250/a650_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sm8250/a650_zap.mbn";
};
&i2c1 {
diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
index 6c9bb993dc2a3d12b1c7972128e2a2f64fa8dfab..c017399297b9d567eca7fea2667e6c2b398bdf9b 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi
@@ -554,10 +554,10 @@ &gpi_dma2 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sm8250/xiaomi/elish/a650_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sm8250/xiaomi/elish/a650_zap.mbn";
};
&i2c0 {
diff --git a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts
index 12565ad87890fea1cc6c25cc161072d75b793c1d..078ba13f8762e037a8d4199a916c713b7f185b3b 100644
--- a/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts
+++ b/arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts
@@ -424,10 +424,10 @@ &gpi_dma2 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sm8250/xiaomi/pipa/a650_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sm8250/xiaomi/pipa/a650_zap.mbn";
};
&i2c11 {
diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index d30b3bc2db9e1be2258179d9ae68e3ac14d6154a..c7dffa440074073b78e16070d745108f2b3bab28 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -2944,7 +2944,7 @@ gpu: gpu@3d00000 {
status = "disabled";
- zap-shader {
+ gpu_zap_shader: zap-shader {
memory-region = <&gpu_mem>;
};
diff --git a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts
index 24a8c91e9f70f40247fde6eb63aa5ce58e258139..5f975d00946585bca20fa2efe823cbb333aae5a0 100644
--- a/arch/arm64/boot/dts/qcom/sm8350-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8350-hdk.dts
@@ -403,10 +403,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sm8350/a660_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sm8350/a660_zap.mbn";
};
&i2c13 {
diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
index fc4ce9d4977e811c993291a3b5c8ed477b69c75e..5c8fe213f5e4ecbb8a152fd27506c3ba1f281df5 100644
--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
@@ -2051,7 +2051,7 @@ gpu: gpu@3d00000 {
status = "disabled";
- zap-shader {
+ gpu_zap_shader: zap-shader {
memory-region = <&pil_gpu_mem>;
};
diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
index 0c6aa7ddf43263f30595b3f0733ec3e126e38608..268ae0cd642a74d3bae837ac6c189642cacf4be8 100644
--- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
@@ -643,10 +643,10 @@ vreg_l7e_2p8: ldo7 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sm8450/a730_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sm8450/a730_zap.mbn";
};
&i2c9 {
diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index 2ae56c39f2e6d8a11a2ef0f77bffcf05a6fd637e..920a2d1c04d0c5a89d72e7d7cfff24e10befb5d9 100644
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -2459,7 +2459,7 @@ gpu: gpu@3d00000 {
status = "disabled";
- zap-shader {
+ gpu_zap_shader: zap-shader {
memory-region = <&gpu_micro_code_mem>;
};
diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
index b5d7f0cd443a18b167c94e450b5b9412897b2ba2..599850c48494b1daae9508068a153f24fe3bfa91 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts
@@ -955,10 +955,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sm8550/a740_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sm8550/a740_zap.mbn";
};
&lpass_tlmm {
diff --git a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
index 38f2928f23cc3c1905ceea182270ce882d61eed7..f430038bd402c76aef0b4bb069c5e62f8abba969 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts
@@ -642,10 +642,10 @@ vreg_l7n_2p96: ldo7 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sm8550/a740_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sm8550/a740_zap.mbn";
};
&i2c_master_hub_0 {
diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
index 9af2a4fd02ea5bdc0ea14b246d79b34d49e7e2d3..05c98fe2c25be4066b81920364c702c357498cd3 100644
--- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts
@@ -835,10 +835,10 @@ &gpi_dma1 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sm8550/a740_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sm8550/a740_zap.mbn";
};
&lpass_tlmm {
diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi
index aa3167d10a41265ae8c9f178f7505dca89834596..02160f8d08df834e8f2e13b68e6543d990a06acf 100644
--- a/arch/arm64/boot/dts/qcom/sm8550.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi
@@ -2491,7 +2491,7 @@ gpu: gpu@3d00000 {
status = "disabled";
- zap-shader {
+ gpu_zap_shader: zap-shader {
memory-region = <&gpu_micro_code_mem>;
};
diff --git a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
index 87d7190dc991b11f5d1162aabb693dcadd198c51..5bf1af3308ceb647f031deb9f8755c830aa90c37 100644
--- a/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8650-hdk.dts
@@ -900,10 +900,10 @@ &iris {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sm8650/gen70900_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sm8650/gen70900_zap.mbn";
};
&lpass_tlmm {
diff --git a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
index 9e790cf44804d00a056f92514630ef620e212343..b2feac61a89f22a6cac8f663f7364fff86c76301 100644
--- a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
+++ b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts
@@ -830,10 +830,10 @@ &iris {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/sm8650/gen70900_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/sm8650/gen70900_zap.mbn";
};
&lpass_tlmm {
diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi
index 1a323f4ebdd35418d28af720d95e60544161e2e0..07ae74851621f2ec127735e6f1dd92164ffb8d4b 100644
--- a/arch/arm64/boot/dts/qcom/sm8650.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi
@@ -4158,7 +4158,7 @@ gpu: gpu@3d00000 {
status = "disabled";
- zap-shader {
+ gpu_zap_shader: zap-shader {
memory-region = <&gpu_micro_code_mem>;
};
diff --git a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts b/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
index 701f35af7d5cd080de48cb70db3bb9bea3e46264..a9643cd746d500296848f4b0f928a2905dcd49c0 100644
--- a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
+++ b/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts
@@ -763,10 +763,10 @@ vreg_l3j_0p8: ldo3 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/x1e80100/Thundercomm/DEVKIT/qcdxkmsuc8380.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/x1e80100/Thundercomm/DEVKIT/qcdxkmsuc8380.mbn";
};
&i2c1 {
diff --git a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
index 169726984d3b010f5d4874c8d3d0bf5797f10dc9..80ece9db875a59d7b2ee3adb09874b5af6601c1e 100644
--- a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi
@@ -722,10 +722,10 @@ vreg_l3j_0p8: ldo3 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/x1e80100/LENOVO/21N1/qcdxkmsuc8380.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/x1e80100/LENOVO/21N1/qcdxkmsuc8380.mbn";
};
&i2c0 {
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
index f2960953e608fb81be9b941115df6ba2c9913663..d4df21de0d95980620e5241cfdd7a31f016cd7fe 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts
@@ -479,10 +479,10 @@ vreg_l3j_0p8: ldo3 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/x1e80100/ASUSTeK/vivobook-s15/qcdxkmsuc8380.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/x1e80100/ASUSTeK/vivobook-s15/qcdxkmsuc8380.mbn";
};
&i2c0 {
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts b/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts
index c1f49cba61fc40c764122f365f2e4b418579a73b..2f533e56c8c84101973f557c4df2abd21af8832a 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts
@@ -676,10 +676,10 @@ vreg_l3j_0p8: ldo3 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/x1e80100/dell/xps13-9345/qcdxkmsuc8380.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/x1e80100/dell/xps13-9345/qcdxkmsuc8380.mbn";
};
&i2c0 {
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts b/arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts
index 4ea00d8236935fb14fa5119310365ad392d8d5e0..0b3b6cb23e1ab91c90ccb5ac779d70981f3d6d90 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts
@@ -9,10 +9,8 @@ / {
compatible = "hp,elitebook-ultra-g1q", "qcom,x1e80100";
};
-&gpu {
- zap-shader {
- firmware-name = "qcom/x1e80100/hp/elitebook-ultra-g1q/qcdxkmsuc8380.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/x1e80100/hp/elitebook-ultra-g1q/qcdxkmsuc8380.mbn";
};
&remoteproc_adsp {
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
index 56e4d13cca11165c30dcbed8a1e0a4d7f8fa5cc2..4c31d14a07bc67055b836725d4738bd31d611db1 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
@@ -799,10 +799,10 @@ vreg_l3j_0p8: ldo3 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/x1e80100/LENOVO/83ED/qcdxkmsuc8380.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/x1e80100/LENOVO/83ED/qcdxkmsuc8380.mbn";
};
&i2c0 {
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi
index 3b319f65dde1e0df9e53191acfa161ccb49dff7b..7e1e808ea983b6571bde306f575a94c4d6fcff84 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi
+++ b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi
@@ -861,11 +861,11 @@ vreg_l3j: ldo3 {
&gpu {
status = "okay";
+};
- zap-shader {
- memory-region = <&gpu_microcode_mem>;
- firmware-name = "qcom/x1e80100/microsoft/qcdxkmsuc8380.mbn";
- };
+&gpu_zap_shader {
+ memory-region = <&gpu_microcode_mem>;
+ firmware-name = "qcom/x1e80100/microsoft/qcdxkmsuc8380.mbn";
};
&i2c0 {
diff --git a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
index 5a121fc4494014f01be5d6e3ab95060581ec83ad..b742aabd9c049eb0f24cf96fb1af879acfc5d3b6 100644
--- a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
+++ b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts
@@ -831,10 +831,10 @@ vreg_l3j_0p8: ldo3 {
&gpu {
status = "okay";
+};
- zap-shader {
- firmware-name = "qcom/x1e80100/gen70500_zap.mbn";
- };
+&gpu_zap_shader {
+ firmware-name = "qcom/x1e80100/gen70500_zap.mbn";
};
&i2c5 {
--
2.47.3
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 7/7] arm64: dts: qcom: add gpu_zap_shader label
2025-10-28 21:00 ` [PATCH 7/7] arm64: dts: qcom: " Dmitry Baryshkov
@ 2025-10-30 11:04 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2025-10-30 11:04 UTC (permalink / raw)
To: Dmitry Baryshkov, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
On 10/28/25 10:00 PM, Dmitry Baryshkov wrote:
> Patching existing DT nodes based on full path is error prone and
> generally not recommended. Follow the pattern introduced in the last
> platforms, add gpu_zap_shader label to the ZAP node and use it in the
> board files.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
Let's pray this gets merged in an order that doesn't wreck havoc
or require resolving conflicts across 64 files..
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Konrad
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node
2025-10-28 20:59 [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node Dmitry Baryshkov
` (6 preceding siblings ...)
2025-10-28 21:00 ` [PATCH 7/7] arm64: dts: qcom: " Dmitry Baryshkov
@ 2025-10-28 22:21 ` David Heidelberg
2025-10-29 9:33 ` Konrad Dybcio
2025-10-30 18:46 ` Bjorn Andersson
9 siblings, 0 replies; 29+ messages in thread
From: David Heidelberg @ 2025-10-28 22:21 UTC (permalink / raw)
To: Dmitry Baryshkov, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
On 28/10/2025 21:59, Dmitry Baryshkov wrote:
> Historically all devices manually defined GPU zap-shader node in their
> board DT files. This practice is frowned upon. Add the zap-shader node
> on all platforms, define a label for it and use the label in order to
> patch the node with the firmware name.
>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
> ---
> Dmitry Baryshkov (7):
> arm64: dts: qcom: sdm670: create common zap-shader node
> arm64: dts: qcom: sdm845: create common zap-shader node
> arm64: dts: qcom: sc8180x: create common zap-shader node
> arm64: dts: qcom: sc8280xp: create common zap-shader node
> arm64: dts: qcom: sm8250: drop duplicate memory-region defs
> arm64: dts: qcom: sc7180: add gpu_zap_shader label
> arm64: dts: qcom: add gpu_zap_shader label
Reviewed-by: David Heidelberg <david@ixit.cz>
>
> arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 6 +++---
> arch/arm64/boot/dts/qcom/msm8996-oneplus3.dts | 6 +++---
> arch/arm64/boot/dts/qcom/msm8996-oneplus3t.dts | 6 +++---
> arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 6 ++----
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-natrium.dts | 6 ++----
> arch/arm64/boot/dts/qcom/msm8996pro-xiaomi-scorpio.dts | 6 ++----
> arch/arm64/boot/dts/qcom/qcm2290.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 6 +++---
> arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 6 +++---
> arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 7 +++----
> arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 14 +++-----------
> arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 9 ++++-----
> arch/arm64/boot/dts/qcom/sc7180-el2.dtso | 6 ++----
> arch/arm64/boot/dts/qcom/sc7180-idp.dts | 1 +
> arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 1 +
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 ++++
> arch/arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 12 +++---------
> arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 9 +++++----
> arch/arm64/boot/dts/qcom/sc8180x.dtsi | 9 +++++++++
> arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 12 +++---------
> arch/arm64/boot/dts/qcom/sc8280xp-el2.dtso | 6 ++----
> arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 12 +++---------
> arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 12 +++---------
> arch/arm64/boot/dts/qcom/sc8280xp-microsoft-arcata.dts | 12 +++---------
> arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts | 12 +++---------
> arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 9 +++++++++
> arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 7 +++----
> arch/arm64/boot/dts/qcom/sdm670.dtsi | 4 ++++
> arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 8 ++++----
> arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 4 ----
> arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts | 6 ++----
> arch/arm64/boot/dts/qcom/sdm845-lg-judyp.dts | 6 ++----
> arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 7 +++----
> arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 7 +++----
> arch/arm64/boot/dts/qcom/sdm845-samsung-starqltechn.dts | 7 +++----
> arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 7 +++----
> arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 7 +++----
> .../boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 7 +++----
> arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 7 +++----
> arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++++
> arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 7 +++----
> arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 9 ++++-----
> arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 6 +++---
> arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 6 +++---
> arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 7 +++----
> arch/arm64/boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 7 +++----
> arch/arm64/boot/dts/qcom/sm8250-xiaomi-pipa.dts | 7 +++----
> arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 6 +++---
> arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 6 +++---
> arch/arm64/boot/dts/qcom/sm8450.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 6 +++---
> arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 6 +++---
> arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 6 +++---
> arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 6 +++---
> arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 6 +++---
> arch/arm64/boot/dts/qcom/sm8650.dtsi | 2 +-
> arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 6 +++---
> .../arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 6 +++---
> arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 6 +++---
> arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 6 +++---
> .../boot/dts/qcom/x1e80100-hp-elitebook-ultra-g1q.dts | 6 ++----
> arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 6 +++---
> arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 8 ++++----
> arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 6 +++---
> 70 files changed, 198 insertions(+), 244 deletions(-)
> ---
> base-commit: f7d2388eeec24966fc4d5cf32d706f0514f29ac5
> change-id: 20251028-dt-zap-shader-df7c258f6ffc
>
> Best regards,
--
David Heidelberg
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node
2025-10-28 20:59 [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node Dmitry Baryshkov
` (7 preceding siblings ...)
2025-10-28 22:21 ` [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node David Heidelberg
@ 2025-10-29 9:33 ` Konrad Dybcio
2025-10-29 9:35 ` Dmitry Baryshkov
2025-10-30 18:46 ` Bjorn Andersson
9 siblings, 1 reply; 29+ messages in thread
From: Konrad Dybcio @ 2025-10-29 9:33 UTC (permalink / raw)
To: Dmitry Baryshkov, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
On 10/28/25 9:59 PM, Dmitry Baryshkov wrote:
> Historically all devices manually defined GPU zap-shader node in their
> board DT files. This practice is frowned upon. Add the zap-shader node
> on all platforms, define a label for it and use the label in order to
> patch the node with the firmware name.
I'm not sure this is much of an improvement, since at the end of the
series, boards still have a &gpu { zap-shader {} } section, with the
inner one not being referred to through a label, which reduces
duplication in the single LoC used to assign memory-region, but
doesn't e.g. prevent typos in the zap-shader node name
Konrad
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node
2025-10-29 9:33 ` Konrad Dybcio
@ 2025-10-29 9:35 ` Dmitry Baryshkov
2025-10-29 9:36 ` Konrad Dybcio
0 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2025-10-29 9:35 UTC (permalink / raw)
To: Konrad Dybcio, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
On 29/10/2025 11:33, Konrad Dybcio wrote:
> On 10/28/25 9:59 PM, Dmitry Baryshkov wrote:
>> Historically all devices manually defined GPU zap-shader node in their
>> board DT files. This practice is frowned upon. Add the zap-shader node
>> on all platforms, define a label for it and use the label in order to
>> patch the node with the firmware name.
>
> I'm not sure this is much of an improvement, since at the end of the
> series, boards still have a &gpu { zap-shader {} } section, with the
> inner one not being referred to through a label, which reduces
> duplication in the single LoC used to assign memory-region, but
> doesn't e.g. prevent typos in the zap-shader node name
By the end of the series the boards don't have zap-shader{}. They use
&gpu_zap_shader { firmware-name = "something" ; };
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node
2025-10-29 9:35 ` Dmitry Baryshkov
@ 2025-10-29 9:36 ` Konrad Dybcio
2025-10-29 12:35 ` Dmitry Baryshkov
0 siblings, 1 reply; 29+ messages in thread
From: Konrad Dybcio @ 2025-10-29 9:36 UTC (permalink / raw)
To: Dmitry Baryshkov, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley, cros-qcom-dts-watchers
Cc: linux-arm-msm, devicetree, linux-kernel
On 10/29/25 10:35 AM, Dmitry Baryshkov wrote:
> On 29/10/2025 11:33, Konrad Dybcio wrote:
>> On 10/28/25 9:59 PM, Dmitry Baryshkov wrote:
>>> Historically all devices manually defined GPU zap-shader node in their
>>> board DT files. This practice is frowned upon. Add the zap-shader node
>>> on all platforms, define a label for it and use the label in order to
>>> patch the node with the firmware name.
>>
>> I'm not sure this is much of an improvement, since at the end of the
>> series, boards still have a &gpu { zap-shader {} } section, with the
>> inner one not being referred to through a label, which reduces
>> duplication in the single LoC used to assign memory-region, but
>> doesn't e.g. prevent typos in the zap-shader node name
>
> By the end of the series the boards don't have zap-shader{}. They use &gpu_zap_shader { firmware-name = "something" ; };
/me wipes glasses
You're right, I skipped over the last patch
Konrad
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node
2025-10-29 9:36 ` Konrad Dybcio
@ 2025-10-29 12:35 ` Dmitry Baryshkov
2025-10-30 11:04 ` Konrad Dybcio
0 siblings, 1 reply; 29+ messages in thread
From: Dmitry Baryshkov @ 2025-10-29 12:35 UTC (permalink / raw)
To: Konrad Dybcio
Cc: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers, linux-arm-msm, devicetree,
linux-kernel
On Wed, Oct 29, 2025 at 10:36:45AM +0100, Konrad Dybcio wrote:
> On 10/29/25 10:35 AM, Dmitry Baryshkov wrote:
> > On 29/10/2025 11:33, Konrad Dybcio wrote:
> >> On 10/28/25 9:59 PM, Dmitry Baryshkov wrote:
> >>> Historically all devices manually defined GPU zap-shader node in their
> >>> board DT files. This practice is frowned upon. Add the zap-shader node
> >>> on all platforms, define a label for it and use the label in order to
> >>> patch the node with the firmware name.
> >>
> >> I'm not sure this is much of an improvement, since at the end of the
> >> series, boards still have a &gpu { zap-shader {} } section, with the
> >> inner one not being referred to through a label, which reduces
> >> duplication in the single LoC used to assign memory-region, but
> >> doesn't e.g. prevent typos in the zap-shader node name
> >
> > By the end of the series the boards don't have zap-shader{}. They use &gpu_zap_shader { firmware-name = "something" ; };
>
> /me wipes glasses
>
> You're right, I skipped over the last patch
R-B ?
--
With best wishes
Dmitry
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node
2025-10-29 12:35 ` Dmitry Baryshkov
@ 2025-10-30 11:04 ` Konrad Dybcio
0 siblings, 0 replies; 29+ messages in thread
From: Konrad Dybcio @ 2025-10-30 11:04 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, cros-qcom-dts-watchers, linux-arm-msm, devicetree,
linux-kernel
On 10/29/25 1:35 PM, Dmitry Baryshkov wrote:
> On Wed, Oct 29, 2025 at 10:36:45AM +0100, Konrad Dybcio wrote:
>> On 10/29/25 10:35 AM, Dmitry Baryshkov wrote:
>>> On 29/10/2025 11:33, Konrad Dybcio wrote:
>>>> On 10/28/25 9:59 PM, Dmitry Baryshkov wrote:
>>>>> Historically all devices manually defined GPU zap-shader node in their
>>>>> board DT files. This practice is frowned upon. Add the zap-shader node
>>>>> on all platforms, define a label for it and use the label in order to
>>>>> patch the node with the firmware name.
>>>>
>>>> I'm not sure this is much of an improvement, since at the end of the
>>>> series, boards still have a &gpu { zap-shader {} } section, with the
>>>> inner one not being referred to through a label, which reduces
>>>> duplication in the single LoC used to assign memory-region, but
>>>> doesn't e.g. prevent typos in the zap-shader node name
>>>
>>> By the end of the series the boards don't have zap-shader{}. They use &gpu_zap_shader { firmware-name = "something" ; };
>>
>> /me wipes glasses
>>
>> You're right, I skipped over the last patch
>
> R-B ?
rb!
Konrad
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node
2025-10-28 20:59 [PATCH 0/7] arm64: dts: qcom: cleanup GPU's zap-shader node Dmitry Baryshkov
` (8 preceding siblings ...)
2025-10-29 9:33 ` Konrad Dybcio
@ 2025-10-30 18:46 ` Bjorn Andersson
9 siblings, 0 replies; 29+ messages in thread
From: Bjorn Andersson @ 2025-10-30 18:46 UTC (permalink / raw)
To: Konrad Dybcio, Rob Herring, Krzysztof Kozlowski, Conor Dooley,
cros-qcom-dts-watchers, Dmitry Baryshkov
Cc: linux-arm-msm, devicetree, linux-kernel
On Tue, 28 Oct 2025 22:59:59 +0200, Dmitry Baryshkov wrote:
> Historically all devices manually defined GPU zap-shader node in their
> board DT files. This practice is frowned upon. Add the zap-shader node
> on all platforms, define a label for it and use the label in order to
> patch the node with the firmware name.
>
>
Applied, thanks!
[1/7] arm64: dts: qcom: sdm670: create common zap-shader node
commit: f85592223d5bf983b6c495f33cfa0344a9930d5b
[2/7] arm64: dts: qcom: sdm845: create common zap-shader node
commit: 8464b804bd35cf4068e3a7cd19163c0f8a063852
[3/7] arm64: dts: qcom: sc8180x: create common zap-shader node
commit: e3f81bdd46dc4120e9ee373aa8794b84c7dfd2f1
[4/7] arm64: dts: qcom: sc8280xp: create common zap-shader node
commit: 6e9612ced0c90fc19d9b27508f84ebcf5718b8a2
[5/7] arm64: dts: qcom: sm8250: drop duplicate memory-region defs
commit: 00d3f7b0536dec3b5660e25d0767f61ee38941a7
[6/7] arm64: dts: qcom: sc7180: add gpu_zap_shader label
commit: d994ae0427a83087bedcfbb8afabe620529ef594
[7/7] arm64: dts: qcom: add gpu_zap_shader label
commit: 2377626fd216ebdf17294ac0cabc27614fff07d1
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 29+ messages in thread