Re: [Freedreno] [PATCH 4/7] arm64: dts: qcom: sc7280: Add ZAP shader support

[Konrad Dybcio]

On 26.09.2023 20:24, Konrad Dybcio wrote:
> Non-Chrome SC7280-family platforms ship a ZAP shader with the Adreno GPU.
> Describe that and make sure it doesn't interfere with Chrome devices.
> 
> Signed-off-by: Konrad Dybcio 
> ---
>  arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi |  2 ++
>  arch/arm64/boot/dts/qcom/sc7280.dtsi   | 10 ++
>  2 files changed, 12 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi 
> b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
> index 5d462ae14ba1..88fc67c3646e 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
> @@ -17,6 +17,8 @@
>   * required by the setup for Chrome boards.
>   */
>  
> +/delete-node/ _zap_mem;
> +/delete-node/ _zap_shader;
>  /delete-node/ _mem;
>  /delete-node/ _mem;
>  /delete-node/ _xbl_uefi_log;
> diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi 
> b/arch/arm64/boot/dts/qcom/sc7280.dtsi
> index 66f1eb83cca7..c38ddf267ef5 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
> @@ -152,6 +152,11 @@ ipa_fw_mem: memory@8b70 {
>   no-map;
>   };
>  
> + gpu_zap_mem: zap@8b71a000 {
> + reg = <0 0x8b71a000 0 0x2000>;
> + no-map;
> + };
> +
>   rmtfs_mem: memory@9c90 {
>   compatible = "qcom,rmtfs-mem";
>   reg = <0x0 0x9c90 0x0 0x28>;
> @@ -2608,6 +2613,11 @@ gpu: gpu@3d0 {
>   nvmem-cells = <_speed_bin>;
>   nvmem-cell-names = "speed_bin";
>  
> + gpu_zap_shader: zap-shader {
> + memory-region = <_zap_mem>;
> + firmware-name = "qcom/a660_zap.mdt";
Gah. This line shouldn't have been there.

Considering it's not the only oops, I'll resend.

Konrad

[Freedreno] [PATCH 4/7] arm64: dts: qcom: sc7280: Add ZAP shader support

[Konrad Dybcio]

Non-Chrome SC7280-family platforms ship a ZAP shader with the Adreno GPU.
Describe that and make sure it doesn't interfere with Chrome devices.

Signed-off-by: Konrad Dybcio 
---
 arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi |  2 ++
 arch/arm64/boot/dts/qcom/sc7280.dtsi   | 10 ++
 2 files changed, 12 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi 
b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
index 5d462ae14ba1..88fc67c3646e 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi
@@ -17,6 +17,8 @@
  * required by the setup for Chrome boards.
  */
 
+/delete-node/ _zap_mem;
+/delete-node/ _zap_shader;
 /delete-node/ _mem;
 /delete-node/ _mem;
 /delete-node/ _xbl_uefi_log;
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi 
b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 66f1eb83cca7..c38ddf267ef5 100644
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -152,6 +152,11 @@ ipa_fw_mem: memory@8b70 {
no-map;
};
 
+   gpu_zap_mem: zap@8b71a000 {
+   reg = <0 0x8b71a000 0 0x2000>;
+   no-map;
+   };
+
rmtfs_mem: memory@9c90 {
compatible = "qcom,rmtfs-mem";
reg = <0x0 0x9c90 0x0 0x28>;
@@ -2608,6 +2613,11 @@ gpu: gpu@3d0 {
nvmem-cells = <_speed_bin>;
nvmem-cell-names = "speed_bin";
 
+   gpu_zap_shader: zap-shader {
+   memory-region = <_zap_mem>;
+   firmware-name = "qcom/a660_zap.mdt";
+   };
+
gpu_opp_table: opp-table {
compatible = "operating-points-v2";
 

-- 
2.42.0