Commit 1f7574a1 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Bjorn Andersson

arm64: dts: qcom: disable GPU on x1e80100 by default

The GPU on X1E80100 requires ZAP 'shader' file to be useful. Since the
file is signed by the OEM keys and might be not available by default,
disable the GPU node and drop the firmware name from the x1e80100.dtsi
file. Devices not being fused to use OEM keys can specify generic
location at `qcom/x1e80100/gen70500_zap.mbn` while enabling the GPU.

The CRD and QCP were lucky enough to work with the default settings, so
reenable the GPU on those platforms and provide correct firmware-name
(including the SoC subdir).

Fixes: 721e3830 ("arm64: dts: qcom: x1e80100: Add gpu support")
Cc: Akhil P Oommen <quic_akhilpo@quicinc.com>
Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarCaleb Connolly <caleb.connolly@linaro.org>
Reviewed-by: default avatarAkhil P Oommen <quic_akhilpo@quicinc.com>
Link: https://lore.kernel.org/r/20240715-x1e8-zap-name-v3-1-e7a5258c3c2e@linaro.orgSigned-off-by: default avatarBjorn Andersson <andersson@kernel.org>
parent a0e6fbf2
...@@ -636,6 +636,14 @@ vreg_l3j_0p8: ldo3 { ...@@ -636,6 +636,14 @@ vreg_l3j_0p8: ldo3 {
}; };
}; };
&gpu {
status = "okay";
zap-shader {
firmware-name = "qcom/x1e80100/gen70500_zap.mbn";
};
};
&i2c0 { &i2c0 {
clock-frequency = <400000>; clock-frequency = <400000>;
......
...@@ -606,6 +606,14 @@ vreg_l3j_0p8: ldo3 { ...@@ -606,6 +606,14 @@ vreg_l3j_0p8: ldo3 {
}; };
}; };
&gpu {
status = "okay";
zap-shader {
firmware-name = "qcom/x1e80100/gen70500_zap.mbn";
};
};
&lpass_tlmm { &lpass_tlmm {
spkr_01_sd_n_active: spkr-01-sd-n-active-state { spkr_01_sd_n_active: spkr-01-sd-n-active-state {
pins = "gpio12"; pins = "gpio12";
......
...@@ -3167,9 +3167,10 @@ gpu: gpu@3d00000 { ...@@ -3167,9 +3167,10 @@ gpu: gpu@3d00000 {
interconnects = <&gem_noc MASTER_GFX3D 0 &mc_virt SLAVE_EBI1 0>; interconnects = <&gem_noc MASTER_GFX3D 0 &mc_virt SLAVE_EBI1 0>;
interconnect-names = "gfx-mem"; interconnect-names = "gfx-mem";
status = "disabled";
zap-shader { zap-shader {
memory-region = <&gpu_microcode_mem>; memory-region = <&gpu_microcode_mem>;
firmware-name = "qcom/gen70500_zap.mbn";
}; };
gpu_opp_table: opp-table { gpu_opp_table: opp-table {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment