Merge a617d4f302 on remote branch

Change-Id: I9038ee1397ced2844a80b611e103fab88f98a48c
This commit is contained in:
Linux Build Service Account
2023-07-03 21:56:33 -07:00
7 changed files with 57 additions and 40 deletions

View File

@@ -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

View File

@@ -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>;
@@ -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>;

View File

@@ -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>;

View File

@@ -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 {

View File

@@ -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>,

View File

@@ -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>,

View File

@@ -51,5 +51,5 @@
};
&sde_dsi {
qcom,dsi-default-panel = <&dsi_vtdr6130_amoled_video>;
qcom,dsi-default-panel = <&dsi_vtdr6130_amoled_cmd>;
};