| Message ID | 20230926-topic-a643-v1-4-7af6937ac0a3@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Adreno 643 + fixes | expand |
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 <konrad.dybcio@linaro.org> > --- > 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/ &gpu_zap_mem; > +/delete-node/ &gpu_zap_shader; > /delete-node/ &hyp_mem; > /delete-node/ &xbl_mem; > /delete-node/ &reserved_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@8b700000 { > no-map; > }; > > + gpu_zap_mem: zap@8b71a000 { > + reg = <0 0x8b71a000 0 0x2000>; > + no-map; > + }; > + > rmtfs_mem: memory@9c900000 { > compatible = "qcom,rmtfs-mem"; > reg = <0x0 0x9c900000 0x0 0x280000>; > @@ -2608,6 +2613,11 @@ gpu: gpu@3d00000 { > nvmem-cells = <&gpu_speed_bin>; > nvmem-cell-names = "speed_bin"; > > + gpu_zap_shader: zap-shader { > + memory-region = <&gpu_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
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/ &gpu_zap_mem; +/delete-node/ &gpu_zap_shader; /delete-node/ &hyp_mem; /delete-node/ &xbl_mem; /delete-node/ &reserved_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@8b700000 { no-map; }; + gpu_zap_mem: zap@8b71a000 { + reg = <0 0x8b71a000 0 0x2000>; + no-map; + }; + rmtfs_mem: memory@9c900000 { compatible = "qcom,rmtfs-mem"; reg = <0x0 0x9c900000 0x0 0x280000>; @@ -2608,6 +2613,11 @@ gpu: gpu@3d00000 { nvmem-cells = <&gpu_speed_bin>; nvmem-cell-names = "speed_bin"; + gpu_zap_shader: zap-shader { + memory-region = <&gpu_zap_mem>; + firmware-name = "qcom/a660_zap.mdt"; + }; + gpu_opp_table: opp-table { compatible = "operating-points-v2";
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 <konrad.dybcio@linaro.org> --- arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 2 ++ arch/arm64/boot/dts/qcom/sc7280.dtsi | 10 ++++++++++ 2 files changed, 12 insertions(+)