From 2f7b4f3f645645ac42632c88785986b1fd43e97c Mon Sep 17 00:00:00 2001 From: Anand Tarakh Date: Wed, 7 Jun 2023 16:41:45 +0530 Subject: [PATCH 1/7] ARM: dts: msm: add display support for crow IDPS platform Add display support for IDPS with Tanggu and IDPS with harmonium platform on crow target. Change-Id: Iaaba2499faa17cad9685cc345cbcb15bdf533921 --- Kbuild | 4 +- display/crow-sde-display-idp-wcd-overlay.dts | 2 +- display/crow-sde-display-idps-overlay.dts | 11 ++ display/crow-sde-display-idps-wcd-overlay.dts | 11 ++ display/crow-sde-display-idps-wcd.dtsi | 1 + display/crow-sde-display-idps.dtsi | 149 ++++++++++++++++++ 6 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 display/crow-sde-display-idps-overlay.dts create mode 100644 display/crow-sde-display-idps-wcd-overlay.dts create mode 100644 display/crow-sde-display-idps-wcd.dtsi create mode 100644 display/crow-sde-display-idps.dtsi diff --git a/Kbuild b/Kbuild index c22dae65..3010a3e5 100644 --- a/Kbuild +++ b/Kbuild @@ -28,7 +28,9 @@ dtbo-$(CONFIG_ARCH_CROW) += display/crow-sde.dtbo \ display/crow-sde-display-idp-wcd-overlay.dtbo \ display/crow-sde-display-atp-overlay.dtbo \ display/crow-sde-display-rumi-overlay.dtbo \ - display/crow-sde-display-qrd-overlay.dtbo + display/crow-sde-display-qrd-overlay.dtbo \ + display/crow-sde-display-idps-overlay.dtbo \ + display/crow-sde-display-idps-wcd-overlay.dtbo else dtbo-$(CONFIG_ARCH_CROW) += display/trustedvm-crow-sde-display-idp-overlay.dtbo \ display/trustedvm-crow-sde-display-idp-wcd-overlay.dtbo \ diff --git a/display/crow-sde-display-idp-wcd-overlay.dts b/display/crow-sde-display-idp-wcd-overlay.dts index 67ab0753..8350514b 100644 --- a/display/crow-sde-display-idp-wcd-overlay.dts +++ b/display/crow-sde-display-idp-wcd-overlay.dts @@ -7,5 +7,5 @@ model = "Qualcomm Technologies, Inc. Crow IDP WCD"; compatible = "qcom,crow-idp", "qcom,crow", "qcom,idp"; qcom,msm-id = <608 0x10000>; - qcom,board-id = <34 1>, <34 2>, <34 3>; + qcom,board-id = <34 1>, <34 3>; }; diff --git a/display/crow-sde-display-idps-overlay.dts b/display/crow-sde-display-idps-overlay.dts new file mode 100644 index 00000000..4fd883a1 --- /dev/null +++ b/display/crow-sde-display-idps-overlay.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "crow-sde-display-idps.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Crow IDPS"; + compatible = "qcom,crow-idp", "qcom,crow", "qcom,idp"; + qcom,msm-id = <608 0x10000>; + qcom,board-id = <34 4>; +}; diff --git a/display/crow-sde-display-idps-wcd-overlay.dts b/display/crow-sde-display-idps-wcd-overlay.dts new file mode 100644 index 00000000..d16bf2bd --- /dev/null +++ b/display/crow-sde-display-idps-wcd-overlay.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "crow-sde-display-idps-wcd.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Crow IDPS WCD"; + compatible = "qcom,crow-idp", "qcom,crow", "qcom,idp"; + qcom,msm-id = <608 0x10000>; + qcom,board-id = <34 2>; +}; diff --git a/display/crow-sde-display-idps-wcd.dtsi b/display/crow-sde-display-idps-wcd.dtsi new file mode 100644 index 00000000..f822ab5d --- /dev/null +++ b/display/crow-sde-display-idps-wcd.dtsi @@ -0,0 +1 @@ +#include "crow-sde-display-idps.dtsi" diff --git a/display/crow-sde-display-idps.dtsi b/display/crow-sde-display-idps.dtsi new file mode 100644 index 00000000..263b0f26 --- /dev/null +++ b/display/crow-sde-display-idps.dtsi @@ -0,0 +1,149 @@ +#include "crow-sde-display.dtsi" + +&dsi_vtdr6130_amoled_cmd { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <10>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-brightness-max-level = <8191>; + qcom,mdss-dsi-bl-inverted-dbv; + qcom,platform-reset-gpio = <&tlmm 127 0>; + + qcom,mdss-dsi-display-timings { + timing@0 { + /delete-property/ qcom,mdss-dsi-panel-clockrate; + }; + + timing@1 { + /delete-property/ qcom,mdss-dsi-panel-clockrate; + }; + + timing@2 { + /delete-property/ qcom,mdss-dsi-panel-clockrate; + }; + + timing@3 { + /delete-property/ qcom,mdss-dsi-panel-clockrate; + }; + }; +}; + +&dsi_vtdr6130_amoled_120hz_cmd { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <10>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-brightness-max-level = <8191>; + qcom,mdss-dsi-bl-inverted-dbv; + qcom,platform-reset-gpio = <&tlmm 127 0>; + + qcom,mdss-dsi-display-timings { + timing@0 { + /delete-property/ qcom,mdss-dsi-panel-clockrate; + }; + + timing@1 { + /delete-property/ qcom,mdss-dsi-panel-clockrate; + }; + + timing@2 { + /delete-property/ qcom,mdss-dsi-panel-clockrate; + }; + }; +}; + +&dsi_vtdr6130_amoled_video { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <10>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-brightness-max-level = <8191>; + qcom,mdss-dsi-bl-inverted-dbv; + qcom,platform-reset-gpio = <&tlmm 127 0>; +}; + +&dsi_sim_panel_au { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <10>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-brightness-max-level = <8191>; + qcom,mdss-dsi-bl-inverted-dbv; + qcom,platform-reset-gpio = <&tlmm 127 0>; +}; + +&dsi_vtdr6130_amoled_120hz_video { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <10>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-brightness-max-level = <8191>; + qcom,mdss-dsi-bl-inverted-dbv; + qcom,platform-reset-gpio = <&tlmm 127 0>; +}; + +&dsi_vtdr6130_amoled_90hz_video { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <10>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-brightness-max-level = <8191>; + qcom,mdss-dsi-bl-inverted-dbv; + qcom,platform-reset-gpio = <&tlmm 127 0>; +}; + +&dsi_vtdr6130_amoled_qsync_144hz_cmd { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <10>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-brightness-max-level = <8191>; + qcom,mdss-dsi-bl-inverted-dbv; + qcom,platform-reset-gpio = <&tlmm 127 0>; +}; + +&dsi_vtdr6130_amoled_qsync_144hz_video { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; + qcom,mdss-dsi-bl-min-level = <10>; + qcom,mdss-dsi-bl-max-level = <4095>; + qcom,mdss-brightness-max-level = <8191>; + qcom,mdss-dsi-bl-inverted-dbv; + qcom,platform-reset-gpio = <&tlmm 127 0>; +}; + +&dsi_sim_cmd { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply_sim>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; +}; + +&dsi_sim_vid { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply_sim>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; +}; + +&dsi_sim_dsc_375_cmd { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply_sim>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; +}; + +&dsi_sim_dsc_10b_cmd { + qcom,panel-supply-entries = <&dsi_panel_pwr_supply_sim>; + qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs"; +}; + +&sde_dsi { + qcom,dsi-default-panel = <&dsi_vtdr6130_amoled_cmd>; +}; + +&qupv3_se0_spi { + goodix-berlin@0 { + panel = <&dsi_vtdr6130_amoled_cmd + &dsi_vtdr6130_amoled_video + &dsi_vtdr6130_amoled_120hz_cmd + &dsi_vtdr6130_amoled_120hz_video + &dsi_vtdr6130_amoled_qsync_144hz_cmd + &dsi_vtdr6130_amoled_qsync_144hz_video + &dsi_vtdr6130_amoled_90hz_video>; + }; +}; From 9a36021949adba974c6f6f2c830661a18fe9bc8e Mon Sep 17 00:00:00 2001 From: Akash Gajjar Date: Fri, 9 Jun 2023 14:16:21 +0530 Subject: [PATCH 2/7] ARM: dts: msm: update QoS table for crow target Update the QoS danger/safe/creq LUT configs and VBIF remapper configs for crow target. Change-Id: Id7f5108c7b8282f3763cfafca36a10cc51622c16 --- bindings/sde.txt | 36 +++++++++++++++++++++--------------- display/crow-sde-common.dtsi | 19 +++++++++++++------ 2 files changed, 34 insertions(+), 21 deletions(-) diff --git a/bindings/sde.txt b/bindings/sde.txt index 0b4fa143..0a006b35 100644 --- a/bindings/sde.txt +++ b/bindings/sde.txt @@ -471,24 +471,30 @@ Optional properties: - qcom,sde-downscaling-prefill-lines: A u32 value indicates the latency of downscaling in lines. - qcom,sde-max-per-pipe-bw-kbps: Array of u32 value indicates the max per pipe bandwidth in Kbps. - qcom,sde-amortizable-threshold: This value indicates the min for traffic shaping in lines. -- qcom,sde-vbif-qos-rt-remap: This u32 array is used to program vbif qos remapper register - priority for realtime clients. First 8 entries are for rp_remap and - the next 8 entries are for lvl_remap. -- qcom,sde-vbif-qos-nrt-remap: This u32 array is used to program vbif qos remapper register - priority for non-realtime clients. First 8 entries are for rp_remap and - the next 8 entries are for lvl_remap. +- qcom,sde-ddr-type: A u32 array indicates per pipe bandwidth and vbif qos + configurations for different ddr types. +- qcom,sde-vbif-qos-rt-remap: This u32 array is used to program the target vbif qos remapper + register priority for realtime clients based on ddr-type. + First 8 entries are for rp_remap and the next 8 entries are + for lvl_remap. +- qcom,sde-vbif-qos-nrt-remap: This u32 array is used to program the target vbif qos remapper + register priority for non-realtime clients based on ddr-type. + First 8 entries are for rp_remap and the next 8 entries are + for lvl_remap. - qcom,sde-vbif-qos-cwb-remap: This u32 array is used to program vbif qos remapper register - priority for concurrent writeback clients. First 8 entries are + priority for concurrent writeback clients based on ddr-type. + First 8 entries are for rp_remap and the next 8 entries are + for lvl_remap. +- qcom,sde-vbif-qos-lutdma-remap: This u32 array is used to program vbif qos remapper + register priority for lutdma client based on ddr-type. + First 8 entries are for rp_remap and the next 8 entries are + for lvl_remap. +- qcom,sde-vbif-qos-cnoc-remap: This u32 array is used to program vbif qos remapper register + priority for cnoc clients based on ddr-type. First 8 entries are for rp_remap and the next 8 entries are for lvl_remap. -- qcom,sde-vbif-qos-lutdma-remap: This u32 array is used to program vbif qos remapper register - priority for lutdma client. First 8 entries are for rp_remap and - the next 8 entries are for lvl_remap. -- qcom,sde-vbif-qos-cnoc-remap: This u32 array is used to program vbif qos remapper register - priority for cnoc clients. First 8 entries are for rp_remap and - the next 8 entries are for lvl_remap. - qcom,sde-vbif-qos-offline-wb-remap: This u32 array is used to program vbif qos remapper register - priority for offline-wb clients. First 8 entries are for rp_remap - and the next 8 entries are for lvl_remap. + priority for offline-wb clients based on ddr-type. First 8 entries + are for rp_remap and the next 8 entries are for lvl_remap. - qcom,sde-qos-refresh-rates: This u32 array indicates danger, safe and creq luts qos configuration for different refresh rates. - qcom,sde-danger-lut: This u32 array of 16 cell property, with a format of diff --git a/display/crow-sde-common.dtsi b/display/crow-sde-common.dtsi index 5d659025..c8bbb3a3 100644 --- a/display/crow-sde-common.dtsi +++ b/display/crow-sde-common.dtsi @@ -182,12 +182,19 @@ qcom,sde-vbif-default-ot-wr-limit = <32>; qcom,sde-vbif-dynamic-ot-wr-limit = <62208000 2 124416000 6 497664000 16>; - qcom,sde-vbif-qos-rt-remap = <4 4 5 5 5 5 6 6 4 4 5 5 5 5 6 6>; - qcom,sde-vbif-qos-nrt-remap = <3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3>; - qcom,sde-vbif-qos-cwb-remap = <4 4 4 4 4 5 6 6 4 4 4 4 4 5 6 6>; - qcom,sde-vbif-qos-lutdma-remap = <4 4 5 5 5 5 6 6 4 4 5 5 5 5 6 6>; - qcom,sde-vbif-qos-offline-wb-remap = <3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3>; - qcom,sde-vbif-qos-cnoc-remap = <3 3 4 4 5 5 5 5 3 3 3 3 3 3 3 3>; + qcom,sde-ddr-type = <0x8 0x7>; + qcom,sde-vbif-qos-rt-remap = <4 4 5 5 6 6 6 6 4 4 5 5 6 6 6 6>, + <4 4 5 5 5 5 6 6 4 4 5 5 5 5 6 6>; + qcom,sde-vbif-qos-nrt-remap = <3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3>, + <3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3>; + qcom,sde-vbif-qos-cwb-remap = <4 4 5 5 5 5 6 6 4 4 5 5 5 5 6 6>, + <4 4 4 4 4 5 6 6 4 4 4 4 4 5 6 6>; + qcom,sde-vbif-qos-lutdma-remap = <4 4 5 5 5 5 6 6 4 4 5 5 5 5 6 6>, + <4 4 5 5 5 5 6 6 4 4 5 5 5 5 6 6>; + qcom,sde-vbif-qos-offline-wb-remap = <3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3>, + <3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3>; + qcom,sde-vbif-qos-cnoc-remap = <3 3 4 4 5 5 5 5 3 3 3 3 3 3 3 3>, + <3 3 4 4 5 5 5 5 3 3 3 3 3 3 3 3>; qcom,sde-danger-lut = <0xffff 0xffff 0xffff 0xffff 0x0 0x0 0x0 0x0 0x0 0x0 0xffff 0xffff 0xffff 0xffff 0x0 0x0>; From c48cb2b2db4ae5e260c7787dda7d1b7a3486e820 Mon Sep 17 00:00:00 2001 From: Akash Gajjar Date: Thu, 15 Jun 2023 18:02:13 +0530 Subject: [PATCH 3/7] ARM: dts: msm: update max low/high bandwidth for crow target Update the maximum low/high bandwidth value for the crow target according to the DDR type. Change-Id: Id8ff51f98a0cbb31aa8ccd067410046737865015 --- display/crow-sde-common.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/display/crow-sde-common.dtsi b/display/crow-sde-common.dtsi index 5d659025..cf481d9a 100644 --- a/display/crow-sde-common.dtsi +++ b/display/crow-sde-common.dtsi @@ -149,8 +149,8 @@ qcom,sde-has-dest-scaler; qcom,sde-max-trusted-vm-displays = <1>; - qcom,sde-max-bw-low-kbps = <5200000>; - qcom,sde-max-bw-high-kbps = <10400000>; + qcom,sde-max-bw-low-kbps = <8000000>; + qcom,sde-max-bw-high-kbps = <12600000>; qcom,sde-min-core-ib-kbps = <2500000>; qcom,sde-min-llcc-ib-kbps = <0>; qcom,sde-min-dram-ib-kbps = <800000>; From 8e7159d7a53321e8e0f255abee793f0b2b7841ec Mon Sep 17 00:00:00 2001 From: Rajeev Nandan Date: Fri, 9 Jun 2023 17:11:56 +0530 Subject: [PATCH 4/7] ARM: dts: msm: remove DSI split link support DSI split link is NPOR on Kalama and Crow targets. Change-Id: Ie016e7a133a46266f6bd70d1fa4cd797b9363e0a --- display/crow-sde.dtsi | 2 +- display/kalama-sde.dtsi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/display/crow-sde.dtsi b/display/crow-sde.dtsi index 4f55d3bf..0985455b 100644 --- a/display/crow-sde.dtsi +++ b/display/crow-sde.dtsi @@ -239,7 +239,7 @@ &mdss_dsi0 { vdda-1p2-supply = <&L4B>; - qcom,split-link-supported; + clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK>, <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_BYTE0_INTF_CLK>, diff --git a/display/kalama-sde.dtsi b/display/kalama-sde.dtsi index d8beca73..31fa55b1 100644 --- a/display/kalama-sde.dtsi +++ b/display/kalama-sde.dtsi @@ -251,7 +251,7 @@ &mdss_dsi0 { vdda-1p2-supply = <&L3E>; - qcom,split-link-supported; + clocks = <&dispcc DISP_CC_MDSS_BYTE0_CLK>, <&dispcc DISP_CC_MDSS_BYTE0_CLK_SRC>, <&dispcc DISP_CC_MDSS_BYTE0_INTF_CLK>, @@ -265,7 +265,7 @@ &mdss_dsi1 { vdda-1p2-supply = <&L3E>; - qcom,split-link-supported; + clocks = <&dispcc DISP_CC_MDSS_BYTE1_CLK>, <&dispcc DISP_CC_MDSS_BYTE1_CLK_SRC>, <&dispcc DISP_CC_MDSS_BYTE1_INTF_CLK>, From d16c1b107f7bdc08cdf1eac4a53f6fd9317c1806 Mon Sep 17 00:00:00 2001 From: Anand Tarakh Date: Thu, 22 Jun 2023 11:24:03 +0530 Subject: [PATCH 5/7] ARM: dts: msm: update display reset gpio for Crow target Update display reset gpio for Crow target. Change-Id: I32a17d7d61dcceefb07be8e2c9e990e96c176e9f --- display/crow-sde-display-idp.dtsi | 16 ++++++++-------- display/crow-sde-display-idps.dtsi | 16 ++++++++-------- display/crow-sde-display-pinctrl.dtsi | 8 ++++---- display/trustedvm-crow-sde-display-idp.dtsi | 8 ++++---- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/display/crow-sde-display-idp.dtsi b/display/crow-sde-display-idp.dtsi index 2732d7af..6ecbf67c 100644 --- a/display/crow-sde-display-idp.dtsi +++ b/display/crow-sde-display-idp.dtsi @@ -7,7 +7,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_vtdr6130_amoled_120hz_cmd { @@ -17,7 +17,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_vtdr6130_amoled_video { @@ -27,7 +27,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_sim_panel_au { @@ -37,7 +37,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_vtdr6130_amoled_120hz_video { @@ -47,7 +47,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_vtdr6130_amoled_90hz_video { @@ -57,7 +57,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_vtdr6130_amoled_qsync_144hz_cmd { @@ -67,7 +67,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_vtdr6130_amoled_qsync_144hz_video { @@ -77,7 +77,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_sim_cmd { diff --git a/display/crow-sde-display-idps.dtsi b/display/crow-sde-display-idps.dtsi index 263b0f26..fa37ddc7 100644 --- a/display/crow-sde-display-idps.dtsi +++ b/display/crow-sde-display-idps.dtsi @@ -7,7 +7,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; qcom,mdss-dsi-display-timings { timing@0 { @@ -35,7 +35,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; qcom,mdss-dsi-display-timings { timing@0 { @@ -59,7 +59,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_sim_panel_au { @@ -69,7 +69,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_vtdr6130_amoled_120hz_video { @@ -79,7 +79,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_vtdr6130_amoled_90hz_video { @@ -89,7 +89,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_vtdr6130_amoled_qsync_144hz_cmd { @@ -99,7 +99,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_vtdr6130_amoled_qsync_144hz_video { @@ -109,7 +109,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_sim_cmd { diff --git a/display/crow-sde-display-pinctrl.dtsi b/display/crow-sde-display-pinctrl.dtsi index 3361c2b0..08a16f92 100644 --- a/display/crow-sde-display-pinctrl.dtsi +++ b/display/crow-sde-display-pinctrl.dtsi @@ -2,12 +2,12 @@ pmx_sde: pmx_sde { sde_dsi_active: sde_dsi_active { mux { - pins = "gpio127"; + pins = "gpio29"; function = "gpio"; }; config { - pins = "gpio127"; + pins = "gpio29"; drive-strength = <8>; /* 8 mA */ bias-disable = <0>; /* no pull */ }; @@ -15,12 +15,12 @@ sde_dsi_suspend: sde_dsi_suspend { mux { - pins = "gpio127"; + pins = "gpio29"; function = "gpio"; }; config { - pins = "gpio127"; + pins = "gpio29"; drive-strength = <2>; /* 2 mA */ bias-pull-down; /* PULL DOWN */ }; diff --git a/display/trustedvm-crow-sde-display-idp.dtsi b/display/trustedvm-crow-sde-display-idp.dtsi index 51a9fd18..0419d8fa 100644 --- a/display/trustedvm-crow-sde-display-idp.dtsi +++ b/display/trustedvm-crow-sde-display-idp.dtsi @@ -7,7 +7,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_vtdr6130_amoled_video { @@ -17,7 +17,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_vtdr6130_amoled_qsync_144hz_cmd { @@ -26,7 +26,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_vtdr6130_amoled_qsync_144hz_video { @@ -35,7 +35,7 @@ qcom,mdss-dsi-bl-max-level = <4095>; qcom,mdss-brightness-max-level = <8191>; qcom,mdss-dsi-bl-inverted-dbv; - qcom,platform-reset-gpio = <&tlmm 127 0>; + qcom,platform-reset-gpio = <&tlmm 29 0>; }; &dsi_sim_cmd { From 00fe631d67bc51660fae30278cc05f3dc46d77b6 Mon Sep 17 00:00:00 2001 From: Anand Tarakh Date: Fri, 23 Jun 2023 16:46:42 +0530 Subject: [PATCH 6/7] ARM: dts: msm: update default panel to vtdr6130 command for Crow Update default panel to vtdr6130 command on idp platform for Crow Change-Id: If573b818e8262f9bf9f5f6c60998bd1ed0a9e514 --- display/crow-sde-display-idp.dtsi | 2 +- display/trustedvm-crow-sde-display-idp.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/display/crow-sde-display-idp.dtsi b/display/crow-sde-display-idp.dtsi index 2732d7af..7d4f803d 100644 --- a/display/crow-sde-display-idp.dtsi +++ b/display/crow-sde-display-idp.dtsi @@ -101,7 +101,7 @@ }; &sde_dsi { - qcom,dsi-default-panel = <&dsi_vtdr6130_amoled_video>; + qcom,dsi-default-panel = <&dsi_vtdr6130_amoled_cmd>; }; &qupv3_se0_spi { diff --git a/display/trustedvm-crow-sde-display-idp.dtsi b/display/trustedvm-crow-sde-display-idp.dtsi index 51a9fd18..83a7c54e 100644 --- a/display/trustedvm-crow-sde-display-idp.dtsi +++ b/display/trustedvm-crow-sde-display-idp.dtsi @@ -51,5 +51,5 @@ }; &sde_dsi { - qcom,dsi-default-panel = <&dsi_vtdr6130_amoled_video>; + qcom,dsi-default-panel = <&dsi_vtdr6130_amoled_cmd>; }; From 641f70494175e1b21dd5ac4b42b8b2c658e3df90 Mon Sep 17 00:00:00 2001 From: Anand Tarakh Date: Sat, 24 Jun 2023 16:11:08 +0530 Subject: [PATCH 7/7] ARM: dts: msm: remove unsupported timings from cmd sim panels on crow Crow supports maximum resolution of WQHD, FHD+ and maximum FPS of 180. Remove all timings with unsupported resolutions and frame rates from command mode sim panels. This will otherwise lead to Surface Flinger failures. Change-Id: I7dc81bb7700d8fe03332ba6e60508109874ad233 --- display/crow-sde-display-common.dtsi | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/display/crow-sde-display-common.dtsi b/display/crow-sde-display-common.dtsi index 5c330ac2..c752914e 100644 --- a/display/crow-sde-display-common.dtsi +++ b/display/crow-sde-display-common.dtsi @@ -349,14 +349,10 @@ qcom,default-topology-index = <0>; }; - timing@6 { /* FHD+ 240 FPS cmd mode*/ - qcom,mdss-dsi-panel-phy-timings = [00 89 26 27 42 39 25 - 27 1f 02 04 00 69 2a]; - qcom,display-topology = <2 2 1>; - qcom,default-topology-index = <0>; - }; + /delete-node/ timing@6; /* FHD+ 240 FPS cmd mode*/ timing@7 { /* FHD+ 120FPS cmd mode*/ + cell-index = <6>; qcom,mdss-dsi-panel-phy-timings = [00 4a 13 14 28 24 12 14 11 02 04 00 39 18]; qcom,display-topology = <1 1 1>, @@ -365,6 +361,7 @@ }; timing@8 { /* FHD+ 1FPS cmd mode*/ + cell-index = <7>; qcom,mdss-dsi-panel-phy-timings = [03 04 00 00 0d 18 01 00 01 02 04 00 05 05]; qcom,display-topology = <1 1 1>, @@ -373,6 +370,7 @@ }; timing@9 { /* FHD+ 5FPS cmd mode*/ + cell-index = <8>; qcom,mdss-dsi-panel-phy-timings = [03 06 00 00 0d 1a 01 00 01 02 04 00 06 05]; qcom,display-topology = <1 1 1>, @@ -381,6 +379,7 @@ }; timing@10 { /* FHD+ 10FPS cmd mode*/ + cell-index = <9>; qcom,mdss-dsi-panel-phy-timings = [03 07 00 01 0d 1a 01 01 01 02 04 00 07 06]; qcom,display-topology = <1 1 1>, @@ -389,6 +388,7 @@ }; timing@11 { /* FHD+ 24FPS cmd mode*/ + cell-index = <10>; qcom,mdss-dsi-panel-phy-timings = [00 09 01 01 0e 1b 02 01 01 02 04 00 08 06]; qcom,display-topology = <1 1 1>, @@ -397,6 +397,7 @@ }; timing@12 { /* FHD+ 30FPS cmd mode*/ + cell-index = <11>; qcom,mdss-dsi-panel-phy-timings = [00 0a 01 02 0e 1b 02 02 01 02 04 00 09 07]; qcom,display-topology = <1 1 1>, @@ -405,6 +406,7 @@ }; timing@13 { /* FHD+ 144FPS cmd mode*/ + cell-index = <12>; qcom,mdss-dsi-panel-phy-timings = [00 1a 06 06 16 20 07 06 07 02 04 00 16 0b]; qcom,display-topology = <1 1 1>, @@ -485,14 +487,10 @@ qcom,default-topology-index = <0>; }; - timing@4 { /* FHD+ 240FPS cmd mode*/ - qcom,mdss-dsi-panel-phy-timings = [00 28 0a 0b 1b 1a 0a - 0b 0a 02 04 00 21 0f]; - qcom,display-topology = <2 2 1>; - qcom,default-topology-index = <0>; - }; + /delete-node/ timing@4; /* FHD+ 240FPS cmd mode*/ timing@5 { /* FHD+ 120FPS cmd mode*/ + cell-index = <4>; qcom,mdss-dsi-panel-phy-timings = [00 16 05 05 14 13 06 06 06 02 04 00 13 0b]; qcom,display-topology = <2 2 1>; @@ -500,6 +498,7 @@ }; timing@6 { /* FHD+ 1FPS cmd mode*/ + cell-index = <5>; qcom,mdss-dsi-panel-phy-timings = [03 04 00 00 0d 18 01 00 01 02 04 00 05 05]; qcom,display-topology = <1 1 1>, @@ -508,6 +507,7 @@ }; timing@7 { /* FHD+ 10FPS cmd mode*/ + cell-index = <6>; qcom,mdss-dsi-panel-phy-timings = [03 07 00 01 0d 1a 01 01 01 02 04 00 07 06]; qcom,display-topology = <1 1 1>, @@ -516,6 +516,7 @@ }; timing@8 { /* FHD+ 24FPS cmd mode*/ + cell-index = <7>; qcom,mdss-dsi-panel-phy-timings = [00 09 01 01 0e 1b 02 01 01 02 04 00 08 06]; qcom,display-topology = <1 1 1>, @@ -524,6 +525,7 @@ }; timing@9 { /* FHD+ 30FPS cmd mode*/ + cell-index = <8>; qcom,mdss-dsi-panel-phy-timings = [00 0a 01 02 0e 1b 02 02 01 02 04 00 09 07]; qcom,display-topology = <1 1 1>, @@ -532,6 +534,7 @@ }; timing@10 { /* FHD+ 90FPS cmd mode*/ + cell-index = <9>; qcom,mdss-dsi-panel-phy-timings = [00 39 0f 0e 21 2a 0e 0f 0d 02 04 00 2d 13]; qcom,display-topology = <2 2 1>; @@ -539,6 +542,7 @@ }; timing@11 { /* FHD+ 144FPS cmd mode*/ + cell-index = <10>; qcom,mdss-dsi-panel-phy-timings = [00 1a 06 06 16 20 07 06 07 02 04 00 16 0b]; qcom,display-topology = <2 2 1>;