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

Commit cce0a823 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: Add support for multiple WFD writeback modes"

parents 4ee6bc0e f9121b8a

Documentation/devicetree/bindings/fb/mdss-mdp.txt

+9 −4
Original line number Original line Diff line number Diff line
@@ -245,9 +245,14 @@ Optional properties: 
				AD offset).

				AD offset).

- qcom,mdss-has-wb-ad: Boolean property to indicate assertive display feature

- qcom,mdss-has-wb-ad: Boolean property to indicate assertive display feature

				support on write back framebuffer.

				support on write back framebuffer.

- qcom,mdss-has-wfd-blk: Boolean property to indicate the presence of dedicated

- qcom,mdss-mdp-wfd-mode:	A string that specifies what is the mode of

			writeback wfd block in MDSS as opposed to writeback

				   writeback wfd block.

			block that is shared between rotator and wfd.

				"intf" = Writeback wfd block is

				   connected to the interface mixer.

				"shared" = Writeback block shared

				   between wfd and rotator.

				"dedicated" = Dedicated writeback

				   block for wfd using writeback mixer.

- qcom,mdss-smp-mb-per-pipe:	Maximum number of shared memory pool blocks

- qcom,mdss-smp-mb-per-pipe:	Maximum number of shared memory pool blocks

				restricted for a source surface pipe. If this

				restricted for a source surface pipe. If this

				property is not specified, no such restriction

				property is not specified, no such restriction
@@ -406,7 +411,7 @@ Example: 
		qcom,mdss-pref-prim-intf = "dsi";

		qcom,mdss-pref-prim-intf = "dsi";

		qcom,mdss-has-bwc;

		qcom,mdss-has-bwc;

		qcom,mdss-has-decimation;

		qcom,mdss-has-decimation;

		qcom,mdss-has-wfd-blk;

		qcom,mdss-wfd-mode = "intf";





		qcom,mdss-pipe-vig-xin-id = <0 4 8>;

		qcom,mdss-pipe-vig-xin-id = <0 4 8>;

		qcom,mdss-pipe-rgb-xin-id = <1 5 9>;

		qcom,mdss-pipe-rgb-xin-id = <1 5 9>;

arch/arm/boot/dts/qcom/apq8084-mdss.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,7 @@ 




		qcom,mdss-has-bwc;

		qcom,mdss-has-bwc;

		qcom,mdss-has-decimation;

		qcom,mdss-has-decimation;

		qcom,mdss-has-wfd-blk;

		qcom,mdss-wfd-mode = "intf";





		qcom,vbif-settings = <0x0B0 0x00080808>,

		qcom,vbif-settings = <0x0B0 0x00080808>,

				     <0x0B4 0x08000808>,

				     <0x0B4 0x08000808>,

arch/arm/boot/dts/qcom/msm8226-mdss.dtsi

+1 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,7 @@ 
		qcom,mdss-intf-off = <0x00000000 0x00021300>;

		qcom,mdss-intf-off = <0x00000000 0x00021300>;

		qcom,mdss-rot-block-size = <64>;

		qcom,mdss-rot-block-size = <64>;

		qcom,mdss-rotator-ot-limit = <2>;

		qcom,mdss-rotator-ot-limit = <2>;

		qcom,mdss-wfd-mode = "shared";

		qcom,mdss-smp-mb-per-pipe = <3>;

		qcom,mdss-smp-mb-per-pipe = <3>;

		vdd-cx-supply = <&pm8226_s1_corner>;

		vdd-cx-supply = <&pm8226_s1_corner>;

arch/arm/boot/dts/qcom/msm8974-mdss.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -72,7 +72,7 @@ 
		qcom,mdss-intf-off = <0x00021100 0x00021300

		qcom,mdss-intf-off = <0x00021100 0x00021300

					   0x00021500 0x00021700>;

					   0x00021500 0x00021700>;





		qcom,mdss-has-wfd-blk;

		qcom,mdss-wfd-mode = "intf";

		qcom,vbif-settings = <0x0004 0x00000001>,

		qcom,vbif-settings = <0x0004 0x00000001>,

				     <0x00D8 0x00000707>,

				     <0x00D8 0x00000707>,

				     <0x00F0 0x00000030>,

				     <0x00F0 0x00000030>,

drivers/video/msm/mdss/mdss.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -114,7 +114,7 @@ struct mdss_data_type { 
	u32 irq_buzy;

	u32 irq_buzy;

	u32 has_bwc;

	u32 has_bwc;

	u32 has_decimation;

	u32 has_decimation;

	u8 has_wfd_blk;

	u32 wfd_mode;

	u8 has_wb_ad;

	u8 has_wb_ad;





	u32 rotator_ot_limit;

	u32 rotator_ot_limit;