Skip to content

Commit 734230b

Browse files
Jordan Crouseaustriancoder
authored andcommitted
arm: dts: qcom: sm845: Set the compatible string for the GPU SMMU
Set the qcom,adreno-smmu compatible string for the GPU SMMU to enable split pagetables and per-instance pagetables for drm/msm. Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org> Signed-off-by: Rob Clark <robdclark@chromium.org>
1 parent 1037d0d commit 734230b

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,15 @@ ap_ts_i2c: &i2c14 {
633633
status = "okay";
634634
};
635635

636+
/*
637+
* Cheza fw does not properly program the GPU aperture to allow the
638+
* GPU to update the SMMU pagetables for context switches. Work
639+
* around this by dropping the "qcom,adreno-smmu" compat string.
640+
*/
641+
&adreno_smmu {
642+
compatible = "qcom,sdm845-smmu-v2", "qcom,smmu-v2";
643+
};
644+
636645
&mss_pil {
637646
iommus = <&apps_smmu 0x781 0x0>,
638647
<&apps_smmu 0x724 0x3>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4103,7 +4103,7 @@
41034103
};
41044104

41054105
adreno_smmu: iommu@5040000 {
4106-
compatible = "qcom,sdm845-smmu-v2", "qcom,smmu-v2";
4106+
compatible = "qcom,sdm845-smmu-v2", "qcom,adreno-smmu", "qcom,smmu-v2";
41074107
reg = <0 0x5040000 0 0x10000>;
41084108
#iommu-cells = <1>;
41094109
#global-interrupts = <2>;

0 commit comments

Comments
 (0)