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

Commit 3323b133 authored by Rohith Palakurthi's avatar Rohith Palakurthi
Browse files

Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14 




* commit '20b0fd20':
  Documentation: change pinctrl configuration to optional
  drm/msm/dp: use correct bpp in validate_mode
  drm/msm/dp: change pinctrl configuration to optional
  ARM: dts: msm: add the lphw support for minidp hpd on sm6150
  Documentation: add low power hardware HPD property information
  drm/msm/dp: minidp hpd through tlmm and dp tx controller
  drm/msm/dsi-staging: clear the error bits before unmasking
  drm/msm/dsi-staging: fix spurious irq status for TE signal
  ARM: dts: msm: add dp-dsc resource caps for sm8150 target
  Documentation: add dsc and mst node information for sm8150
  drm/msm/dsi-staging: add split DSI support with external bridge
  msm/sde/rotator: avoid dropping alpha channel fetch for rotator sspp
  drm/msm/sde: add missing documentation for merge3d blocks
  drm/msm/sde: signal retire fence at ctl start timeout

Conflicts:
	drivers/gpu/drm/msm/dsi-staging/dsi_display.c

Signed-off-by: default avatarRohith Palakurthi <prohit@codeaurora.org>
Change-Id: I16ce8e5e52e7a9009fcccc2377a91254ce34b004
parents 4d48f4d5 20b0fd20

Documentation/devicetree/bindings/display/msm/sde.txt

+6 −0
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ Required properties 
				from register "mdp_phys" defined in reg property.

- qcom,sde-pp-slave:		Array of flags indicating whether each ping pong

				block may be configured as a pp slave.

- qcom,sde-pp-merge-3d-id:	Array of index ID values for the merge 3d block

				connected to each pingpong, starting at 0.

- qcom,sde-merge-3d-off:	Array of offset addresses for the available

				merge 3d blocks. These offsets are calculated

				from register "mdp_phys" defined in reg property.

- qcom,sde-intf-off:		Array of offset addresses for the available SDE

				interface blocks that can drive data to a

				panel controller. The offsets are calculated
@@ -101,6 +106,7 @@ Optional properties: 
- qcom,sde-dsc-size:		A u32 value indicates the address range for each dsc.

- qcom,sde-cdm-size:		A u32 value indicates the address range for each cdm.

- qcom,sde-pp-size:		A u32 value indicates the address range for each pingpong.

- qcom,sde-merge-3d-size:	A u32 value indicates the address range for each merge 3d.

- qcom,sde-wb-size:		A u32 value indicates the address range for each writeback.

- qcom,sde-len:			A u32 entry for SDE address range.

- qcom,sde-intf-max-prefetch-lines:	Array of u32 values for max prefetch lines on

Documentation/devicetree/bindings/drm/msm/sde-dp.txt

+16 −5
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ DP Controller: Required properties: 
					within DP AUX, while the remaining entries indicate the

					programmable values.

- qcom,max-pclk-frequency-khz:	An integer specifying the max. pixel clock in KHz supported by Display Port.

- qcom,mst-enable:		MST feature enable control node.

- qcom,dsc-feature-enable:	DSC feature enable control node.

- qcom,fec-feature-enable:	FEC feature enable control node.

- qcom,max-dp-dsc-blks:		An integer specifying the max. DSC blocks available for Display port.

- qcom,max-dp-dsc-input-width-pixs: An integer specifying the max. input width of pixels for each DSC block.

- qcom,dp-usbpd-detection:	Phandle for the PMI regulator node for USB PHY PD detection.

- qcom,dp-aux-switch:		Phandle for the driver used to program the AUX switch for Display Port orientation.

- qcom,dp-hpd-gpio:		HPD gpio for direct DP connector without USB PHY or AUX switch.
@@ -86,11 +91,6 @@ DP Controller: Required properties: 
					-- qcom,supply-post-on-sleep: time to sleep (ms) after turning on

					-- qcom,supply-pre-off-sleep: time to sleep (ms) before turning off

					-- qcom,supply-post-off-sleep: time to sleep (ms) after turning off

- pinctrl-names:	List of names to assign mdss pin states defined in pinctrl device node

					Refer to pinctrl-bindings.txt

- pinctrl-<0..n>:	Lists phandles each pointing to the pin configuration node within a pin

					controller. These pin configurations are installed in the pinctrl

					device node. Refer to pinctrl-bindings.txt



msm_ext_disp is a device which manages the interaction between external

display interfaces, e.g. Display Port, and the audio subsystem.
@@ -98,7 +98,13 @@ display interfaces, e.g. Display Port, and the audio subsystem. 
Optional properties:

- qcom,ext-disp:		phandle for msm-ext-display module

- compatible:			Must be "qcom,msm-ext-disp"

- qcom,dp-low-power-hw-hpd:	Low power hardware HPD feature enable control node

- qcom,phy-version:		Phy version

- pinctrl-names:		List of names to assign mdss pin states defined in pinctrl device node

				Refer to pinctrl-bindings.txt

- pinctrl-<0..n>:		Lists phandles each pointing to the pin configuration node within a pin

				controller. These pin configurations are installed in the pinctrl

				device node. Refer to pinctrl-bindings.txt



[Optional child nodes]: These nodes are for devices which are

dependent on msm_ext_disp. If msm_ext_disp is disabled then
@@ -172,6 +178,11 @@ Example: 
		qcom,aux-cfg8-settings = [3c bb];

		qcom,aux-cfg9-settings = [40 03];

		qcom,max-pclk-frequency-khz = <593470>;

		qcom,mst-enable;

		qcom,dsc-feature-enable;

		qcom,fec-feature-enable;

		qcom,max-dp-dsc-blks = <2>;

		qcom,max-dp-dsc-input-width-pixs = <2048>;

		pinctrl-names = "mdss_dp_active", "mdss_dp_sleep";

		pinctrl-0 = <&sde_dp_aux_active &sde_dp_usbplug_cc_active>;

		pinctrl-1 = <&sde_dp_aux_suspend &sde_dp_usbplug_cc_suspend>;

arch/arm64/boot/dts/qcom/sm6150-pinctrl.dtsi

+16 −2
Original line number Diff line number Diff line
@@ -745,7 +745,21 @@ 
			};

		};



		sde_dp_hotplug_enable: sde_dp_hotplug_enable {

		sde_dp_hotplug_ctrl: sde_dp_hotplug_ctrl {

			mux {

				pins = "gpio103";

				function = "debug_hot";

			};



			config {

				pins = "gpio103";

				bias-disable;

				input-enable;

				drive-strength = <2>;

			};

		};



		sde_dp_hotplug_tlmm: sde_dp_hotplug_tlmm {

			mux {

				pins = "gpio103";

				function = "gpio";
@@ -753,7 +767,7 @@ 


			config {

				pins = "gpio103";

				bias-pull-down;

				bias-disable;

				input-enable;

				drive-strength = <2>;

			};

arch/arm64/boot/dts/qcom/sm6150-sde-display.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -210,6 +210,27 @@ 


&sde_dp {

	qcom,dp-usbpd-detection = <&pm6150_pdphy>;

	hpd-pwr-supply = <&pm6150_l17>;

	qcom,phy-supply-entries {

		#address-cells = <1>;

		#size-cells = <0>;

		qcom,phy-supply-entry@0 {

			reg = <0>;

			qcom,supply-name = "vdda-0p9";

			qcom,supply-min-voltage = <880000>;

			qcom,supply-max-voltage = <975000>;

			qcom,supply-enable-load = <36000>;

			qcom,supply-disable-load = <0>;

		};

		qcom,phy-supply-entry@1 {

			reg = <1>;

			qcom,supply-name = "hpd-pwr";

			qcom,supply-min-voltage = <3000000>;

			qcom,supply-max-voltage = <3230000>;

			qcom,supply-enable-load = <30000>;

			qcom,supply-disable-load = <0>;

		};

	};

};



&mdss_mdp {

arch/arm64/boot/dts/qcom/sm6150-sde.dtsi

+5 −16
Original line number Diff line number Diff line
@@ -531,11 +531,14 @@ 
		qcom,usbplug-cc-gpio = <&tlmm 104 0>;



		pinctrl-names = "mdss_dp_active", "mdss_dp_sleep",

						"mdss_dp_hpd_active";

				"mdss_dp_hpd_active", "mdss_dp_hpd_tlmm",

				"mdss_dp_hpd_ctrl";

		pinctrl-0 = <&sde_dp_usbplug_cc_active &sde_dp_switch_active>;

		pinctrl-1 = <&sde_dp_usbplug_cc_suspend &sde_dp_switch_suspend>;

		pinctrl-2 = <&sde_dp_connector_enable &sde_dp_switch_suspend

						&sde_dp_hotplug_enable>;

						&sde_dp_hotplug_tlmm>;

		pinctrl-3 = <&sde_dp_hotplug_tlmm>;

		pinctrl-4 = <&sde_dp_hotplug_ctrl>;



		qcom,ctrl-supply-entries {

			#address-cells = <1>;
@@ -551,20 +554,6 @@ 
			};

		};



		qcom,phy-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;



			qcom,phy-supply-entry@0 {

				reg = <0>;

				qcom,supply-name = "vdda-0p9";

				qcom,supply-min-voltage = <880000>;

				qcom,supply-max-voltage = <975000>;

				qcom,supply-enable-load = <36000>;

				qcom,supply-disable-load = <0>;

			};

		};



		qcom,core-supply-entries {

			#address-cells = <1>;

			#size-cells = <0>;