Skip to content

Commit 1f7574a

Browse files
lumagandersson
authored andcommitted
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: 721e383 ("arm64: dts: qcom: x1e80100: Add gpu support") Cc: Akhil P Oommen <[email protected]> Reviewed-by: Konrad Dybcio <[email protected]> Signed-off-by: Dmitry Baryshkov <[email protected]> Reviewed-by: Caleb Connolly <[email protected]> Reviewed-by: Akhil P Oommen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Andersson <[email protected]>
1 parent a0e6fbf commit 1f7574a

File tree

3 files changed

+18
-1
lines changed

3 files changed

+18
-1
lines changed

arch/arm64/boot/dts/qcom/x1e80100-crd.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,14 @@
636636
};
637637
};
638638

639+
&gpu {
640+
status = "okay";
641+
642+
zap-shader {
643+
firmware-name = "qcom/x1e80100/gen70500_zap.mbn";
644+
};
645+
};
646+
639647
&i2c0 {
640648
clock-frequency = <400000>;
641649

arch/arm64/boot/dts/qcom/x1e80100-qcp.dts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,14 @@
606606
};
607607
};
608608

609+
&gpu {
610+
status = "okay";
611+
612+
zap-shader {
613+
firmware-name = "qcom/x1e80100/gen70500_zap.mbn";
614+
};
615+
};
616+
609617
&lpass_tlmm {
610618
spkr_01_sd_n_active: spkr-01-sd-n-active-state {
611619
pins = "gpio12";

arch/arm64/boot/dts/qcom/x1e80100.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3167,9 +3167,10 @@
31673167
interconnects = <&gem_noc MASTER_GFX3D 0 &mc_virt SLAVE_EBI1 0>;
31683168
interconnect-names = "gfx-mem";
31693169

3170+
status = "disabled";
3171+
31703172
zap-shader {
31713173
memory-region = <&gpu_microcode_mem>;
3172-
firmware-name = "qcom/gen70500_zap.mbn";
31733174
};
31743175

31753176
gpu_opp_table: opp-table {

0 commit comments

Comments
 (0)