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

Commit 041f000d 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: Synchronize DSI off, BTA status and DSI event handler"

parents 00f32032 4858ece5

drivers/video/msm/mdss/dsi_status_6g.c

+3 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ void mdss_check_dsi_ctrl_status(struct work_struct *work, uint32_t interval) 
	 * overlay operations. Need refine this lock for command mode

	 */



	mutex_lock(&ctrl_pdata->mutex);

	mutex_lock(&ctl->offlock);

	if (mipi->mode == DSI_CMD_MODE)

		mutex_lock(&mdp5_data->ov_lock);
@@ -157,6 +158,7 @@ void mdss_check_dsi_ctrl_status(struct work_struct *work, uint32_t interval) 
		if (mipi->mode == DSI_CMD_MODE)

			mutex_unlock(&mdp5_data->ov_lock);

		mutex_unlock(&ctl->offlock);

		mutex_unlock(&ctrl_pdata->mutex);

		pr_err("%s: DSI turning off, avoiding panel status check\n",

							__func__);

		return;
@@ -184,6 +186,7 @@ void mdss_check_dsi_ctrl_status(struct work_struct *work, uint32_t interval) 
	if (mipi->mode == DSI_CMD_MODE)

		mutex_unlock(&mdp5_data->ov_lock);

	mutex_unlock(&ctl->offlock);

	mutex_unlock(&ctrl_pdata->mutex);



	if ((pstatus_data->mfd->panel_power_state == MDSS_PANEL_POWER_ON)) {

		if (ret > 0)

drivers/video/msm/mdss/mdss_dsi.c

+2 −0
Original line number Diff line number Diff line
@@ -548,6 +548,7 @@ static int mdss_dsi_off(struct mdss_panel_data *pdata, int power_state) 
	ctrl_pdata = container_of(pdata, struct mdss_dsi_ctrl_pdata,

				panel_data);



	mutex_lock(&ctrl_pdata->mutex);

	panel_info = &ctrl_pdata->panel_data.panel_info;



	pr_debug("%s+: ctrl=%p ndx=%d power_state=%d\n",
@@ -590,6 +591,7 @@ panel_power_ctrl: 
		panel_info->mipi.frame_rate = panel_info->new_fps;



end:

	mutex_unlock(&ctrl_pdata->mutex);

	pr_debug("%s-:\n", __func__);



	return ret;