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

Commit 98e6c6a5 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 ftrace for per pipe qos configuration"

parents 494ca1d5 058a474c
Loading
Loading
Loading
Loading
+13 −4
Original line number Diff line number Diff line
@@ -424,20 +424,22 @@ Optional properites:
					mixers to reduce power.
					Ex: Normally 1080x1920 display uses single DSI and thus one layer
					    mixer. But if we use two layer mixers then mux the output of
					    those mixers two into single stream and route it to single DSI
					    those two mixers into single stream and route it to single DSI
					    then we can lower the clock requirements of MDP. To use this
					    configuration we need two fill this array with <540 540>.
					This property should not be used if underlying display is using
					two DSI panels such a way that each carrying half the display.
					Both values doesn't have to be same, but recommended, however sum of
					both values has to be equal to the panel-width.
					By default two mixer streams are merged using 2D mux, however if
					2 DSC encoders are used then merge is performed within compression
					engine.
- qcom,split-mode:			String property indicating which split mode MDP should use. Valid
					entries are "pingpong-split" and "dualctl-split".
					This property is mutually exclusive with qcom,lm-split.
- qcom,mdss-dsc-encoders:		An integer value indicating how many DSC encoders should be used
					to drive data stream to DSI.
					Default value is 1 and max value is 2.
					2 encoder should be used only if qcom,mdss-lm-split is used.
					2 encoder should be used only if qcom,mdss-lm-split or
					qcom,split-mode with pingpong-split is used.
- qcom,mdss-dsc-slice-height:		An integer value indicates the dsc slice height.
- qcom,mdss-dsc-slice-width:		An integer value indicates the dsc slice width.
					Multiple of slice width should be equal to panel-width.
@@ -695,5 +697,12 @@ Example:
			qcom,mdss-dsc-config-by-manufacture-cmd;
		};

		dsi_sim_vid_config2: config2 {
			qcom,split-mode = "dualctl-split";
		};

		dsi_sim_vid_config3: config3 {
			qcom,split-mode = "pingpong-split";
		};
	};
};
+20 −11
Original line number Diff line number Diff line
@@ -373,10 +373,6 @@ Optional properties:
				    clients.
- qcom,mdss-dram-channels:	This represents the number of channels in the
				Bus memory controller.
- qcom,mdss-ppb-off:		Array of offset addresses of ping pong buffer control registers.
				The offsets are calculated from the "mdp_phys" base address
				specified. The number of offsets should match the
				number of ping pong buffers available in the hardware.
- qcom,regs-dump-mdp:		This array represents the registers offsets that
				will be dumped from the mdp when the debug logging
				is enabled; each entry in the table is an start and
@@ -480,10 +476,23 @@ Fudge Factors: Fudge factors are used to boost demand for
				each rt and nrt clients. This property is
				for the MDPv1.7 and above, which configures
				the panic independently on each client.
				First element on the array is for the panic
				configuration, second element for robust.
				Each element of the array corresponds to:
				First element - panic for linear formats
				Second element - panic for tile formats
				Third element - robust for linear formats
				Fourth element - robust for tile formats
- qcom,mdss-has-pingpong-split:	Boolean property to indicate if destination
				split feature is available or not in the target.
- qcom,mdss-slave-pingpong-off:	Offset address for the extra TE block which needs
				to be programmed when pingpong split feature is enabled.
				Offset is calculated from the "mdp_phys"
				register value. Mandatory when qcom,mdss-has-pingpong-split
				is enabled.
- qcom,mdss-ppb-off:		Array of offset addresses of ping pong buffer control registers.
				The offsets are calculated from the "mdp_phys" base address
				specified. The number of offsets should match the
				number of ping pong buffers available in the hardware.
				Mandatory when qcom,mdss-has-pingpong-split is enabled.
- qcom,mdss-cdm-off:            Array of offset addresses for the available
				chroma down modules that can convert RGB data
				to YUV before sending it to the interface
@@ -500,11 +509,6 @@ Fudge Factors: Fudge factors are used to boost demand for
- qcom,max-pipe-width:		This value specifies the maximum MDP SSPP width
				the device supports. If not specified, a default value
				of 2048 will be applied.
- qcom,mdss-slave-pingpong-off:	Offset address for the extra TE block which needs
				to be programmed when pingpong split feature is enabled.
				Offset is calculated from the "mdp_phys"
				register value. Mandatory when qcom,mdss-has-pingpong-split
				is enabled.

Optional subnodes:
- mdss_fb:		Child nodes representing the frame buffer virtual devices.
@@ -693,6 +697,11 @@ Example:
		qcom,mdss-pipe-dma-clk-ctrl-offsets = <0x3AC 8 12>,
						      <0x3B4 8 12>;

		qcom,mdss-per-pipe-panic-luts = <0x000f>,
						<0xffff>,
						<0xfffc>,
						<0xff00>;

		qcom,mdss-has-panic-ctrl;
		qcom,mdss-pipe-vig-panic-ctrl-offsets = <0 1 2 3>;
		qcom,mdss-pipe-rgb-panic-ctrl-offsets = <4 5 6 7>;
+10 −0
Original line number Diff line number Diff line
@@ -89,5 +89,15 @@

		qcom,mdss-dsi-on-command-state = "dsi_lp_mode";
		qcom,mdss-dsi-off-command-state = "dsi_hs_mode";

		qcom,config-select = <&dsi_dual_nt35597_cmd_config0>;

		dsi_dual_nt35597_cmd_config0: config0 {
			qcom,split-mode = "dualctl-split";
		};

		dsi_dual_nt35597_cmd_config1: config1 {
			qcom,split-mode = "pingpong-split";
		};
	};
};
+10 −0
Original line number Diff line number Diff line
@@ -70,5 +70,15 @@
		qcom,mdss-dsi-dma-trigger = "trigger_sw";
		qcom,mdss-dsi-mdp-trigger = "none";
		qcom,mdss-dsi-reset-sequence = <1 20>, <0 20>, <1 50>;

		qcom,config-select = <&dsi_dual_nt35597_video_config0>;

		dsi_dual_nt35597_video_config0: config0 {
			qcom,split-mode = "dualctl-split";
		};

		dsi_dual_nt35597_video_config1: config1 {
			qcom,split-mode = "pingpong-split";
		};
	};
};
+10 −0
Original line number Diff line number Diff line
@@ -64,5 +64,15 @@
		qcom,mdss-dsi-panel-status-check-mode = "bta_check";
		qcom,mdss-dsi-tx-eot-append;
		qcom,esd-check-enabled;

		qcom,config-select = <&dsi_dual_sharp_video_config0>;

		dsi_dual_sharp_video_config0: config0 {
			qcom,split-mode = "dualctl-split";
		};

		dsi_dual_sharp_video_config1: config1 {
			qcom,split-mode = "pingpong-split";
		};
	};
};
Loading