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

Commit cfd55f2c 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: update MDP control off sequence for 8909"

parents 26b208bd e137f668

drivers/video/msm/mdss/mdp3_ctrl.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -684,7 +684,7 @@ static int mdp3_ctrl_off(struct msm_fb_data_type *mfd) 
	mdp3_histogram_stop(mdp3_session, MDP_BLOCK_DMA_P);

	mdp3_histogram_stop(mdp3_session, MDP_BLOCK_DMA_P);





	if (panel->event_handler)

	if (panel->event_handler)

		rc = panel->event_handler(panel, MDSS_EVENT_PANEL_OFF, NULL);

		rc = panel->event_handler(panel, MDSS_EVENT_BLANK, NULL);

	if (rc)

	if (rc)

		pr_err("fail to turn off the panel\n");

		pr_err("fail to turn off the panel\n");
@@ -698,16 +698,15 @@ static int mdp3_ctrl_off(struct msm_fb_data_type *mfd) 




	pr_debug("mdp3_ctrl_off stop clock\n");

	pr_debug("mdp3_ctrl_off stop clock\n");

	if (mdp3_session->clk_on) {

	if (mdp3_session->clk_on) {

		rc = mdp3_res_update(0, 1, MDP3_CLIENT_DMA_P);

		if (rc)

			pr_err("mdp clock resource release failed\n");



		pr_debug("mdp3_ctrl_off stop dsi controller\n");

		pr_debug("mdp3_ctrl_off stop dsi controller\n");

		if (panel->event_handler)

		if (panel->event_handler)

			rc = panel->event_handler(panel,

			rc = panel->event_handler(panel,

				MDSS_EVENT_BLANK, NULL);

				MDSS_EVENT_PANEL_OFF, NULL);

		if (rc)

		if (rc)

			pr_err("fail to turn off the panel\n");

			pr_err("fail to turn off the panel\n");

		rc = mdp3_res_update(0, 1, MDP3_CLIENT_DMA_P);

		if (rc)

			pr_err("mdp clock resource release failed\n");

	}

	}





	mdp3_ctrl_notifier_unregister(mdp3_session,

	mdp3_ctrl_notifier_unregister(mdp3_session,