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

Commit 8838a4b3 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: Acquire shared lock after getting frame on wfd"

parents 87529bb2 e79c1f4b

drivers/video/msm/mdss/mdss_mdp_ctl.c

+2 −1
Original line number Diff line number Diff line
@@ -2758,6 +2758,7 @@ int mdss_mdp_display_commit(struct mdss_mdp_ctl *ctl, void *arg) 
		}

	}



	if (!ctl->shared_lock)

		mdss_mdp_ctl_notify(ctl, MDP_NOTIFY_FRAME_READY);



	if (ctl->wait_pingpong)

drivers/video/msm/mdss/mdss_mdp_overlay.c

+7 −2
Original line number Diff line number Diff line
@@ -1298,8 +1298,11 @@ int mdss_mdp_overlay_kickoff(struct msm_fb_data_type *mfd, 
	int ret = 0;

	int sd_in_pipe = 0;



	if (ctl->shared_lock)

	if (ctl->shared_lock) {

		mdss_mdp_ctl_notify(ctl, MDP_NOTIFY_FRAME_BEGIN);

		mdss_mdp_ctl_notify(ctl, MDP_NOTIFY_FRAME_READY);

		mutex_lock(ctl->shared_lock);

	}



	mutex_lock(&mdp5_data->ov_lock);

	mutex_lock(&mdp5_data->list_lock);
@@ -1323,7 +1326,9 @@ int mdss_mdp_overlay_kickoff(struct msm_fb_data_type *mfd, 
			mdp5_data->sd_enabled = 0;

	}



	if (!ctl->shared_lock)

		mdss_mdp_ctl_notify(ctl, MDP_NOTIFY_FRAME_BEGIN);



	mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);



	if (data)