Merge "msm: mdss: do not init phy and controller with cont splash enabled" (28b7e1f2) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/msm_mdss_io_8974.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -1086,8 +1086,15 @@ static int mdss_dsi_core_power_ctrl(struct mdss_dsi_ctrl_pdata *ctrl,
		*/
		if (pdata->panel_info.blank_state == MDSS_PANEL_BLANK_BLANK)
		mdss_dsi_phy_sw_reset(ctrl->ctrl_base);

		/*
		* Phy and controller setup need not be done during bootup
		* when continuous splash screen is enabled.
		*/
		if (!pdata->panel_info.cont_splash_enabled) {
		mdss_dsi_phy_init(ctrl);
		mdss_dsi_ctrl_setup(ctrl);
		}

		if (ctrl->ulps) {
		/*