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

 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,
-- 
With best wishes
Dmitry

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>

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

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

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

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

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

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