Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f09eabd authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: update sde qos config for lagoon"

parents ecd12af3 04095a53

bindings/display/msm/sde.txt

+38 −46
Original line number Diff line number Diff line
@@ -383,48 +383,51 @@ 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

- qcom,sde-qos-refresh-rates:	A u32 array, indicating the different refresh rates for

				danger, safe and creq luts on sspp and wb. All luts will be

				multidimensional values when multiple refresh rate qos is present.

- qcom,sde-danger-lut:		A u32 array of 5 cell property, with a format of

				<linear, tile, nrt, cwb, tile-qseed>,

				indicating the danger luts on sspp.

- qcom,sde-safe-lut-linear:	Array of 2 cell property, with a format of

				indicating the danger luts on sspp and wb.

- qcom,sde-safe-lut-linear:	A u32 array of 2 cell property, with a format of

				<fill level, lut> 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

- qcom,sde-safe-lut-macrotile:	A u32 array of 2 cell property, with a format of

				<fill level, lut> 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

- qcom,sde-safe-lut-macrotile-qseed: A u32 array of 2 cell property, with a format of

				<fill level, lut> 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

- qcom,sde-safe-lut-nrt:	A u32 array of 2 cell property, with a format of

				<fill level, lut> 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

- qcom,sde-safe-lut-cwb:	A u32 array of 2 cell property, with a format of

				<fill level, lut> 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

- qcom,sde-qos-lut-linear:	A u64 array of 3 cell property, with a format of

				<fill level, lut hi, lut lo> 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

- qcom,sde-qos-lut-macrotile:	A u64 array of 3 cell property, with a format of

				<fill level, lut hi, lut lo> 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

- qcom,sde-qos-lut-macrotile-qseed: A u64 array of 3 cell property, with a format of

				<fill level, lut hi, lut lo> 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

- qcom,sde-qos-lut-nrt:		A u64 array of 3 cell property, with a format of

				<fill level, lut hi, lut lo> 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

- qcom,sde-qos-lut-cwb:		A u64 array of 3 cell property, with a format of

				<fill level, lut hi, lut lo> in ascending fill level

				indicating the qos luts for cwb on sspp.

				Zero fill level on the last entry identifies the default lut.
@@ -679,40 +682,29 @@ 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-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 =

    qcom,sde-danger-lut = <0x0000ffff 0x0000ffff

	0x00000000 0x00000000 0x0000ffff>, <0x0003ffff

	0x0003ffff 0x00000000 0x00000000 0x0003ffff>;





    qcom,sde-safe-lut-linear = <0 0xff00>, <0 0xfe00>;

    qcom,sde-safe-lut-macrotile = <0 0xff00>, <0 0xfe00>;

    qcom,sde-safe-lut-macrotile-qseed = <0 0xff00>, <0 0xfe00>;

    qcom,sde-safe-lut-nrt = <0 0xffff>, <0 0xffff>;

    qcom,sde-safe-lut-cwb = <0 0x3ff>, <0x3ff>;





    qcom,sde-qos-lut-linear = <0 0x00112233 0x44556677>,

			 <0 0x00112234 0x45566777>;

    qcom,sde-qos-lut-macrotile = <0 0x00112233 0x44556677>,

			 <0 0x00112234 0x45566777>;

    qcom,sde-qos-lut-macrotile-qseed = <0 0x00112233 0x66777777>,

			 <0 0x00112236 0x67777777>;

    qcom,sde-qos-lut-nrt = <0 0x00000000 0x00000000>,

			 <0 0x00000000 0x00000000>;

    qcom,sde-qos-lut-cwb =

            <0 0x75300000 0x00000000>;

    qcom,sde-qos-lut-cwb = <0 0x66666541 0x00000000>,

			 <0 0x66666541 0x00000000>;

    qcom,sde-qos-refresh-rates = <60 120>;



    qcom,sde-cdp-setting = <1 1>, <1 0>;

qcom/lagoon-sde.dtsi

+18 −11
Original line number Diff line number Diff line
@@ -141,21 +141,28 @@ 


		/* macrotile & macrotile-qseed has the same configs */

		qcom,sde-danger-lut = <0x0000ffff 0x0000ffff

			0x00000000 0x00000000 0x0000ffff>;

			0x00000000 0x00000000 0x0000ffff>, <0x0003ffff

			0x0003ffff 0x00000000 0x00000000 0x0003ffff>;



		qcom,sde-safe-lut-linear = <0 0xff00>;

		qcom,sde-safe-lut-macrotile = <0 0xff00>;

		qcom,sde-safe-lut-linear = <0 0xff00>, <0 0xfe00>;

		qcom,sde-safe-lut-macrotile = <0 0xff00>, <0 0xfe00>;

		/* 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-macrotile-qseed = <0 0xff00>, <0 0xfe00>;

		qcom,sde-safe-lut-nrt = <0 0xffff>, <0 0xffff>;

		qcom,sde-safe-lut-cwb = <0 0x3ff>, <0x3ff>;



		/* creq LUTs */

		qcom,sde-qos-lut-linear = <0 0x00112233 0x44556677>;

		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 = <0 0x00112233 0x44556677>,

					 <0 0x00112234 0x45566777>;

		qcom,sde-qos-lut-macrotile = <0 0x00112233 0x44556677>,

					 <0 0x00112234 0x45566777>;

		qcom,sde-qos-lut-macrotile-qseed = <0 0x00112233 0x66777777>,

					 <0 0x00112236 0x67777777>;

		qcom,sde-qos-lut-nrt = <0 0x00000000 0x00000000>,

					 <0 0x00000000 0x00000000>;

		qcom,sde-qos-lut-cwb = <0 0x66666541 0x00000000>,

					 <0 0x66666541 0x00000000>;

		qcom,sde-qos-refresh-rates = <60 120>;



		qcom,sde-cdp-setting = <1 1>, <1 0>;