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

Commit 9f1c8d35 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: serialize overlay_vsync_ctrl with ov_lock"

parents de0dc349 1042bdd5

drivers/video/msm/mdss/mdss_mdp_overlay.c

+3 −0
Original line number Diff line number Diff line
@@ -2545,6 +2545,7 @@ static void mdss_mdp_overlay_handle_vsync(struct mdss_mdp_ctl *ctl, 


int mdss_mdp_overlay_vsync_ctrl(struct msm_fb_data_type *mfd, int en)

{

	struct mdss_overlay_private *mdp5_data = mfd_to_mdp5_data(mfd);

	struct mdss_mdp_ctl *ctl = mfd_to_ctl(mfd);

	int rc;
@@ -2561,12 +2562,14 @@ int mdss_mdp_overlay_vsync_ctrl(struct msm_fb_data_type *mfd, int en) 


	pr_debug("fb%d vsync en=%d\n", mfd->index, en);



	mutex_lock(&mdp5_data->ov_lock);

	mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);

	if (en)

		rc = ctl->ops.add_vsync_handler(ctl, &ctl->vsync_handler);

	else

		rc = ctl->ops.remove_vsync_handler(ctl, &ctl->vsync_handler);

	mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);

	mutex_unlock(&mdp5_data->ov_lock);



	return rc;

}