From f0c68dac7c7bb43ba2cba005a8ee6285fc69aa00 Mon Sep 17 00:00:00 2001 From: Dhaval Patel Date: Wed, 5 Feb 2020 10:19:31 -0800 Subject: [PATCH] ARM: dts: msm: update sde qos and dcvs config for lahaina This change adds 60 and 120 fps creq, safe and danger lut qos configuration for lahaina target. It also updates the min and max bandwidth limit for per pipe and sde device for lahaina target. Change-Id: I2a0140fd2f6a3b7910df9166d98efff9e1a0e10d --- bindings/sde.txt | 120 ++++++++++++++------------------------- display/lahaina-sde.dtsi | 50 ++++++++-------- 2 files changed, 66 insertions(+), 104 deletions(-) diff --git a/bindings/sde.txt b/bindings/sde.txt index 19432d600a2e..4cf9296109c5 100644 --- a/bindings/sde.txt +++ b/bindings/sde.txt @@ -416,51 +416,35 @@ Optional properties: priority for concurrent writeback clients. - qcom,sde-vbif-qos-lutdma-remap: This array is used to program vbif qos remapper register priority for lutdma client. -- qcom,sde-danger-lut: Array of 5 cell property, with a format of - , - indicating the danger luts on sspp. -- qcom,sde-safe-lut-linear: Array of 2 cell property, with a format of - in ascending fill level - indicating the safe luts for linear format on sspp. - Zero fill level on the last entry identifies the default lut. -- qcom,sde-safe-lut-macrotile: Array of 2 cell property, with a format of - in ascending fill level - indicating the safe luts for macrotile format on sspp. - Zero fill level on the last entry identifies the default lut. -- qcom,sde-safe-lut-macrotile-qseed: Array of 2 cell property, with a format of - in ascending fill level - indicating the safe luts for macrotile format - with qseed3 on sspp. - Zero fill level on the last entry identifies the default lut. -- qcom,sde-safe-lut-nrt: Array of 2 cell property, with a format of - in ascending fill level - indicating the safe luts for nrt (e.g wfd) on sspp. - Zero fill level on the last entry identifies the default lut. -- qcom,sde-safe-lut-cwb: Array of 2 cell property, with a format of - in ascending fill level - indicating the safe luts for cwb on sspp. - Zero fill level on the last entry identifies the default lut. -- qcom,sde-qos-lut-linear: Array of 3 cell property, with a format of - in ascending fill level - indicating the qos luts for linear format on sspp. - Zero fill level on the last entry identifies the default lut. -- qcom,sde-qos-lut-macrotile: Array of 3 cell property, with a format of - in ascending fill level - indicating the qos luts for macrotile format on sspp. - Zero fill level on the last entry identifies the default lut. -- qcom,sde-qos-lut-macrotile-qseed: Array of 3 cell property, with a format of - in ascending fill level - indicating the qos luts for macrotile format - with qseed3 enabled on sspp. - Zero fill level on the last entry identifies the default lut. -- qcom,sde-qos-lut-nrt: Array of 3 cell property, with a format of - in ascending fill level - indicating the qos luts for nrt (e.g wfd) on sspp. - Zero fill level on the last entry identifies the default lut. -- qcom,sde-qos-lut-cwb: Array of 3 cell property, with a format of - in ascending fill level - indicating the qos luts for cwb on sspp. - Zero fill level on the last entry identifies the default lut. +- qcom,sde-qos-refresh-rates: A u32 array indicates danger, safe and creq luts + qos configuration for different refresh rates. +- qcom,sde-danger-lut: A u32 array of 6 cell property, with a format of + , + indicating the danger luts on sspp and wb. +- qcom,sde-safe-lut: A u32 array of 6 cell property, with a format of + , + indicating the safe luts on sspp and wb. +- qcom,sde-qos-lut-linear: A u64 array of 2 cell property, with a format of + in ascending fill level indicating + the creq luts for linear format on sspp. +- qcom,sde-qos-lut-linear-qseed: A u64 array of 2 cell property, with a format of + in ascending fill level indicating + the creq luts for linear format with qseed usage + (scaling) on sspp. +- qcom,sde-qos-lut-macrotile: A u64 array of 2 cell property, with a format of + in ascending fill level indicating + the creq luts for macrotile format on sspp. +- qcom,sde-qos-lut-macrotile-qseed: A u64 array of 2 cell property, with a format of + in ascending fill level + indicating the creq luts for macrotile format + with qseed enabled (scaling enabled) on sspp. +- qcom,sde-qos-lut-nrt: A u64 array of 2 cell property, with a format of + in ascending fill level + indicating the creq luts for nrt (e.g wfd) on sspp + and wb. +- qcom,sde-qos-lut-cwb: A u64 array of 2 cell property, with a format of + in ascending fill level + indicating the creq luts for cwb on sspp. - qcom,sde-cdp-setting: Array of 2 cell property, with a format of for cdp use cases in order of , and . @@ -718,40 +702,20 @@ Example: qcom,sde-wb-id = <2>; qcom,sde-wb-clk-ctrl = <0x2bc 16>; - qcom,sde-danger-lut = <0x0000000f 0x0000ffff 0x00000000 - 0x00000000 0x0000ffff>; - qcom,sde-safe-lut-linear = <0 0xfff8>; - qcom,sde-safe-lut-macrotile = <0 0xf000>; - qcom,sde-safe-lut-macrotile-qseed = <0 0xf000>; - qcom,sde-safe-lut-nrt = <0 0xffff>; - qcom,sde-safe-lut-cwb = <0 0xffff>; + qcom,sde-danger-lut = <0x0000ffff 0x0000ffff 0x00000000 + 0x00000000 0x0000ffff 0x0000ffff>, <0x0003ffff + 0x0003ffff 0x00000000 0x00000000 0x0003ffff 0x0003ffff>; - qcom,sde-qos-lut-linear = - <4 0x00000000 0x00000357>, - <5 0x00000000 0x00003357>, - <6 0x00000000 0x00023357>, - <7 0x00000000 0x00223357>, - <8 0x00000000 0x02223357>, - <9 0x00000000 0x22223357>, - <10 0x00000002 0x22223357>, - <11 0x00000022 0x22223357>, - <12 0x00000222 0x22223357>, - <13 0x00002222 0x22223357>, - <14 0x00012222 0x22223357>, - <0 0x00112222 0x22223357>; - qcom,sde-qos-lut-macrotile = - <10 0x00000003 0x44556677>, - <11 0x00000033 0x44556677>, - <12 0x00000233 0x44556677>, - <13 0x00002233 0x44556677>, - <14 0x00012233 0x44556677>, - <0 0x00112233 0x44556677>; - qcom,sde-qos-lut-macrotile-qseed = - <0 0x00112233 0x66777777>; - qcom,sde-qos-lut-nrt = - <0 0x00000000 0x00000000>; - qcom,sde-qos-lut-cwb = - <0 0x75300000 0x00000000>; + qcom,sde-safe-lut = <0xfff0 0xff00 0xffff 0x3ff 0xff00 0xff00>, + <0xfe00 0xfe00 0xffff 0x3ff 0xfe00 0xfe00>; + + qcom,sde-qos-lut-linear = <0x00112233 0x44556677>, <0x00112234 0x45566777>; + qcom,sde-qos-lut-macrotile = <0x00112233 0x44556677>, <0x00112234 0x45566777>; + qcom,sde-qos-lut-macrotile-qseed = <0x00112233 0x66777777>, <0x00112236 0x67777777>; + qcom,sde-qos-lut-linear-qseed = <0x00112233 0x66777777>, <0x00112236 0x67777777>; + qcom,sde-qos-lut-nrt = <0x0 0x0>, <0x0 0x0>; + qcom,sde-qos-lut-cwb = <0x66666541 0x0>, <0x66666541 0x0>; + qcom,sde-qos-refresh-rates = <60 120>; qcom,sde-cdp-setting = <1 1>, <1 0>; diff --git a/display/lahaina-sde.dtsi b/display/lahaina-sde.dtsi index 685c388836c2..e372bd4aa8ec 100644 --- a/display/lahaina-sde.dtsi +++ b/display/lahaina-sde.dtsi @@ -132,15 +132,15 @@ qcom,sde-mixer-blend-op-off = <0x20 0x38 0x50 0x68 0x80 0x98 0xb0 0xc8 0xe0 0xf8 0x110>; - qcom,sde-max-per-pipe-bw-kbps = <4400000 4400000 - 4400000 4400000 - 4400000 4400000 - 4400000 4400000>; + qcom,sde-max-per-pipe-bw-kbps = <3900000 3900000 + 3900000 3900000 + 3900000 3900000 + 3900000 3900000>; - qcom,sde-max-per-pipe-bw-high-kbps = <5300000 5300000 - 5300000 5300000 - 5300000 5300000 - 5300000 5300000>; + qcom,sde-max-per-pipe-bw-high-kbps = <5200000 5200000 + 5200000 5200000 + 5200000 5200000 + 5200000 5200000>; /* offsets are relative to "mdp_phys + qcom,sde-off */ qcom,sde-sspp-clk-ctrl = @@ -170,9 +170,9 @@ qcom,sde-has-idle-pc; qcom,sde-max-dest-scaler-input-linewidth = <2048>; qcom,sde-max-dest-scaler-output-linewidth = <2560>; - qcom,sde-max-bw-low-kbps = <13700000>; - qcom,sde-max-bw-high-kbps = <16600000>; - qcom,sde-min-core-ib-kbps = <4800000>; + qcom,sde-max-bw-low-kbps = <11800000>; + qcom,sde-max-bw-high-kbps = <15500000>; + qcom,sde-min-core-ib-kbps = <2500000>; qcom,sde-min-llcc-ib-kbps = <0>; qcom,sde-min-dram-ib-kbps = <800000>; qcom,sde-dram-channels = <2>; @@ -193,24 +193,22 @@ qcom,sde-vbif-qos-rt-remap = <3 3 4 4 5 5 6 6>; qcom,sde-vbif-qos-nrt-remap = <3 3 3 3 3 3 3 3>; qcom,sde-vbif-qos-cwb-remap = <3 3 4 4 5 5 6 3>; - qcom,sde-vbif-qos-lutdma-remap = <3 3 3 3 4 4 4 4>; + qcom,sde-vbif-qos-lutdma-remap = <3 3 3 3 4 4 4 6>; - /* macrotile & macrotile-qseed has the same configs */ - qcom,sde-danger-lut = <0x000000ff 0x0000ffff - 0x00000000 0x00000000 0x0000ffff>; + qcom,sde-danger-lut = <0x0000ffff 0x0000ffff 0x00000000 + 0x00000000 0x0000ffff 0x0000ffff>, <0x0003ffff + 0x0003ffff 0x00000000 0x00000000 0x0003ffff 0x0003ffff>; - qcom,sde-safe-lut-linear = <0 0xfff0>; - qcom,sde-safe-lut-macrotile = <0 0xff00>; - /* same as safe-lut-macrotile */ - qcom,sde-safe-lut-macrotile-qseed = <0 0xff00>; - qcom,sde-safe-lut-nrt = <0 0xffff>; - qcom,sde-safe-lut-cwb = <0 0x3ff>; + qcom,sde-safe-lut = <0xfff0 0xff00 0xffff 0x3ff 0xff00 0xff00>, + <0xfe00 0xfe00 0xffff 0x3ff 0xfe00 0xfe00>; - qcom,sde-qos-lut-linear = <0 0x00112222 0x22335777>; - qcom,sde-qos-lut-macrotile = <0 0x00112233 0x44556677>; - qcom,sde-qos-lut-macrotile-qseed = <0 0x00112233 0x66777777>; - qcom,sde-qos-lut-nrt = <0 0x00000000 0x00000000>; - qcom,sde-qos-lut-cwb = <0 0x66666541 0x00000000>; + qcom,sde-qos-lut-linear = <0x00112233 0x44556677>, <0x00112234 0x45566777>; + qcom,sde-qos-lut-macrotile = <0x00112233 0x44556677>, <0x00112234 0x45566777>; + qcom,sde-qos-lut-macrotile-qseed = <0x00112233 0x66777777>, <0x00112236 0x67777777>; + qcom,sde-qos-lut-linear-qseed = <0x00112233 0x66777777>, <0x00112236 0x67777777>; + qcom,sde-qos-lut-nrt = <0x0 0x0>, <0x0 0x0>; + qcom,sde-qos-lut-cwb = <0x66666541 0x0>, <0x66666541 0x0>; + qcom,sde-qos-refresh-rates = <60 120>; qcom,sde-cdp-setting = <1 1>, <1 0>;