Merge "msm: mdss: dsi: fix dsi init sequence with ulps during suspend feature"

	 */

	mdss_dsi_clk_ctrl(ctrl_pdata, ctrl_pdata->dsi_clk_handle,

			  MDSS_DSI_CORE_CLK, MDSS_DSI_CLK_ON);

	if (!pdata->panel_info.ulps_suspend_enabled) {

	/*

	 * If ULPS during suspend feature is enabled, then DSI PHY was

	 * left on during suspend. In this case, we do not need to reset/init

	 * PHY. This would have already been done when the CORE clocks are

	 * turned on. However, if cont splash is disabled, the first time DSI

	 * is powered on, phy init needs to be done unconditionally.

	 */

	if (!pdata->panel_info.ulps_suspend_enabled || !ctrl_pdata->ulps) {

		mdss_dsi_phy_sw_reset(ctrl_pdata);

		mdss_dsi_phy_init(ctrl_pdata);

		mdss_dsi_ctrl_setup(ctrl_pdata);