Skip to content

Commit 1642ab9

Browse files
konradybcioandersson
authored andcommitted
arm64: dts: qcom: sm8150: Don't start Adreno in headless mode
Now that there's display support, there is no reason to assume the default mode for Adreno should be headless. Keep it like that for boards that previously enabled it, so as not to create regressions though. Tested-by: Marijn Suijten <[email protected]> # On Sony Xperia 5 Reviewed-by: Marijn Suijten <[email protected]> Reviewed-by: Dmitry Baryshkov <[email protected]> Signed-off-by: Konrad Dybcio <[email protected]> Signed-off-by: Bjorn Andersson <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent f1d33c9 commit 1642ab9

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

arch/arm64/boot/dts/qcom/sm8150-hdk.dts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,11 @@
359359
};
360360

361361
&gpu {
362+
/*
363+
* NOTE: "amd,imageon" makes Adreno start in headless mode, remove it
364+
* after display support is added on this board.
365+
*/
366+
compatible = "qcom,adreno-640.1", "qcom,adreno", "amd,imageon";
362367
status = "okay";
363368
};
364369

arch/arm64/boot/dts/qcom/sm8150-mtp.dts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,11 @@
354354
};
355355

356356
&gpu {
357+
/*
358+
* NOTE: "amd,imageon" makes Adreno start in headless mode, remove it
359+
* after display support is added on this board.
360+
*/
361+
compatible = "qcom,adreno-640.1", "qcom,adreno", "amd,imageon";
357362
status = "okay";
358363
};
359364

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2153,15 +2153,7 @@
21532153
};
21542154

21552155
gpu: gpu@2c00000 {
2156-
/*
2157-
* note: the amd,imageon compatible makes it possible
2158-
* to use the drm/msm driver without the display node,
2159-
* make sure to remove it when display node is added
2160-
*/
2161-
compatible = "qcom,adreno-640.1",
2162-
"qcom,adreno",
2163-
"amd,imageon";
2164-
2156+
compatible = "qcom,adreno-640.1", "qcom,adreno";
21652157
reg = <0 0x02c00000 0 0x40000>;
21662158
reg-names = "kgsl_3d0_reg_memory";
21672159

0 commit comments

Comments
 (0)