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 <marijn.suijten@somainline.org> # On Sony Xperia 5
Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230331-topic-konahana_speedbin-v3-3-2dede22dd7f7@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/sm8150-hdk.dts b/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
index 8f014a23252600ace502dc0017c58f053d4190ec..c0200e7f3f7418ce00e250b29633946a45d3a0f8 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8150-hdk.dts
@@ -359,6 +359,11 @@
 };
 
 &gpu {
+       /*
+        * NOTE: "amd,imageon" makes Adreno start in headless mode, remove it
+        * after display support is added on this board.
+        */
+       compatible = "qcom,adreno-640.1", "qcom,adreno", "amd,imageon";
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sm8150-mtp.dts b/arch/arm64/boot/dts/qcom/sm8150-mtp.dts
index eff995a07ab77b8260ac11499bc3084e953cf8fb..34ec84916bdd76416ca0e06a7ed78d31e301a140 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8150-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sm8150-mtp.dts
@@ -354,6 +354,11 @@
 };
 
 &gpu {
+       /*
+        * NOTE: "amd,imageon" makes Adreno start in headless mode, remove it
+        * after display support is added on this board.
+        */
+       compatible = "qcom,adreno-640.1", "qcom,adreno", "amd,imageon";
        status = "okay";
 };
 

diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index 69587aaa0559c0ba6abae945e6f1df8c34577d48..39e43a46bb30faf9df9f971f6d0d88574febfbd4 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -2153,15 +2153,7 @@
                };
 
                gpu: gpu@2c00000 {
-                       /*
-                        * note: the amd,imageon compatible makes it possible
-                        * to use the drm/msm driver without the display node,
-                        * make sure to remove it when display node is added
-                        */
-                       compatible = "qcom,adreno-640.1",
-                                    "qcom,adreno",
-                                    "amd,imageon";
-
+                       compatible = "qcom,adreno-640.1", "qcom,adreno";
                        reg = <0 0x02c00000 0 0x40000>;
                        reg-names = "kgsl_3d0_reg_memory";