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

Commit e6f5f48e authored by Abhijith Desai's avatar Abhijith Desai
Browse files

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



* quic/dev/msm-4.14-display:
  ARM: dts: msm: update initial code for TD4330 panel
  drm/msm/dsi-staging: Fix pclk for command mode panel
  drm/msm: enable compilation for new files in display driver
  drm/msm/sde: add qdss hardware files in display driver
  drm/msm/dsi-staging: fix ulps during suspend feature
  drm/msm/dsi-staging: handle panel init failure properly
  ARM: dts: msm: Add AB/IBB power set for AMOLED panel
  drm/msm/dsi-staging: Set the dsi panel type
  dt-bindings: msm: Add strings for dsi panel type
  drm/msm/dsi-staging: only set nolp command when panel in LP1/LP2 mode
  drm/msm/dsi-staging: add default brightness property
  dt-bindings: msm: add support to specify the default brightness
  drm/msm: ignore HS TX timeout when bllp_lp11 is disabled
  drm/msm/sde: clear memory in external HDR properties structure
  drm: increase maximum drm open count to 128
  drm/msm/shd: fix plane stage check in shared display
  drm/msm: enable support for custom power ioctl
  drm/msm: Add boot marker for display driver
  drm/msm/sde: stage border fill after ctl start timeout
  drm/bridge: add 10ms delay for anx7625 resume
  drm/msm/dp: add extra 100ms sleep when MSTM_CTRL is not cleared
  drm: call clear_payload_id_table when mst mode is enabled
  drm: add support to sst-only sink branch device
  drm/msm/sde: update 1.8G BW vote during cont-splash
  msm/sde/rotator: disable write operation on eventlog debugfs nodes
  drm/msm/dp: update link parameters before PSM call
  drm/msm/sde: update the error message for dt parse handler
  drm/msm/dsi-staging: Update pclk calculation stored in mode
  drm/msm: call rsc hw_init after hiberantion
  drm/msm/dsi-staging: update dsi pclk timing calculation
  drm/msm/sde: Add sanity check for crtc and state
  soc: qcom: cx_ipeak: Remove iterator declaration in for loop
  drm/msm/sde: fix for buffer corruption issues with mst connectors
  drm/msm/sde: fix resource allocation for CWB
  ARM: dts: msm: Add qdss block entry for display driver
  drm/msm/sde: parse qdss entry from device tree for display driver
  drm/msm/dsi-staging: Prevent holding mutex on error path
  drm/msm/sde: add qdss config structure in display driver
  drm/msm/sde: stage border fill on both layermixers in WB disable
  ARM: dts: msm: reserve memory for display ramdump for sdmmagpie
  ARM: dts: msm: udapte splash memory node for sdmmagpie

Change-Id: I9f5483ec40522f0e8efe6d7f80177ccb9a654909
Signed-off-by: default avatarAbhijith Desai <desaia@codeaurora.org>
parents 297cd64d 19181fc3

Documentation/devicetree/bindings/drm/msm/mdss-dsi-panel.txt

+6 −0
Original line number Diff line number Diff line
@@ -79,6 +79,10 @@ then 3 options can be tried. 


Optional properties:

- qcom,mdss-dsi-panel-name:		A string used as a descriptive name of the panel

- qcom,mdss-dsi-physical-type:		A string used as a decriptive type of the panel.

					"oled" : That indicate it's an OLED panel.

					"lcd" : That indicate it's an LCD panel.

					If it is not set, consider it is a LCD panel as default.

- qcom,mdss-dsi-panel-phy-timings:	An array of length 'n' char that specifies the DSI PHY lane

					timing settings for the panel. This is specific to SDE DRM driver.

					The value of 'n' depends on the DSI PHY h/w revision and parsing this
@@ -187,6 +191,8 @@ Optional properties: 
					255 = default value.

- qcom,mdss-brightness-max-level:	Specifies the max brightness level supported.

					255 = default value.

- qcom,mdss-dsi-bl-default-level:	Specifies the default brightness level supported.

					"brightness_max_level" = default value.

- qcom,bl-update-flag:			A string that specifies controls for backlight update of the panel.

					"delay_until_first_frame" = Delay backlight update of the panel

					until the first frame is received from the HW.

arch/arm64/boot/dts/qcom/dsi-panel-td4330-truly-singlemipi-fhd-cmd.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ 
						00 0A 00 00 00 00 10 00

						18 00 00 00 B0 00 00 00

						00 00 D0 10 00

					39 01 00 00 00 00 61 EE 07 3F F0

					39 01 00 00 00 00 61 EE 03 3F F0

						03 00 F0 03 00 00 00 00

						02 3F FC 00 00 00 00 00

						00 00 00 00 00 3F 00 00

arch/arm64/boot/dts/qcom/dsi-panel-td4330-truly-singlemipi-fhd-video.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ 
						00 0A 00 00 00 00 10 00

						18 00 00 00 B0 00 00 00

						00 00 D0 10 00

					29 01 00 00 00 00 61 EE 07 3F F0

					29 01 00 00 00 00 61 EE 03 3F F0

						03 00 F0 03 00 00 00 00

						02 3F FC 00 00 00 00 00

						00 00 00 00 00 3F 00 00

arch/arm64/boot/dts/qcom/sdmmagpie.dtsi

+6 −1
Original line number Diff line number Diff line
@@ -650,10 +650,15 @@ 
		};



		cont_splash_memory: cont_splash_region@9c000000 {

			reg = <0x0 0x9c000000 0x0 0x02300000>;

			reg = <0x0 0x9c000000 0x0 0x01800000>;

			label = "cont_splash_region";

		};



		disp_rdump_memory: disp_rdump_region@9c000000 {

			reg = <0x0 0x9c000000 0x0 0x01800000>;

			label = "disp_rdump_region";

		};



		dfps_data_memory: dfps_data_region@9e300000 {

			reg = <0x0 0x9e300000 0x0 0x0100000>;

			label = "dfps_data_region";

arch/arm64/boot/dts/qcom/sm8150-qrd.dtsi

+6 −1
Original line number Diff line number Diff line
@@ -141,8 +141,13 @@ 
	};

};



&sde_dsi {

	lab-supply = &ab_vreg;

	ibb-supply = &ibb_vreg;

};



&dsi_sw43404_amoled_cmd {

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply_vdd_no_labibb>;

	qcom,panel-supply-entries = <&dsi_panel_pwr_supply_vdd_labibb>;

	qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_dcs";

	qcom,mdss-dsi-bl-min-level = <1>;

	qcom,mdss-dsi-bl-max-level = <1023>;