evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: mdss: fix deadlock between display and ESD check thread

Browse source 
Display thread holds ov_lock followed by mutex, while the ESD
check thread for cmd mode panel holds mutex followed by ov_lock.
Fix this deadlock by acquiring mutex before ov_lock in ESD check
thread.

Change-Id: I857f780e14a6ccb679e89ff16b19706d205df4b6
Signed-off-by: Ray Zhang <rayz@codeaurora.org>
This commit is contained in:
Ray Zhang 2016-01-18 15:31:25 +08:00 • committed by David Keitel
parent 5fbd0a8b8e
commit 6c8c0f62d3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/video/fbdev/msm/dsi_status_6g.c
View file

@ -125,17 +125,17 @@ 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);
if (mipi->mode == DSI_CMD_MODE)
mutex_lock(&mdp5_data->ov_lock);
mutex_lock(&ctl->offlock);
mutex_lock(&ctrl_pdata->mutex);
if (mdss_panel_is_power_off(pstatus_data->mfd->panel_power_state) ||
pstatus_data->mfd->shutdown_pending) {
mutex_unlock(&ctrl_pdata->mutex);
mutex_unlock(&ctl->offlock);
if (mipi->mode == DSI_CMD_MODE)
mutex_unlock(&mdp5_data->ov_lock);
mutex_unlock(&ctrl_pdata->mutex);
pr_err("%s: DSI turning off, avoiding panel status check\n",
__func__);
return;
@ -160,10 +160,10 @@ void mdss_check_dsi_ctrl_status(struct work_struct *work, uint32_t interval)
ret = ctrl_pdata->check_status(ctrl_pdata);
mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);
mutex_unlock(&ctrl_pdata->mutex);
mutex_unlock(&ctl->offlock);
if (mipi->mode == DSI_CMD_MODE)
mutex_unlock(&mdp5_data->ov_lock);
mutex_unlock(&ctrl_pdata->mutex);
if ((pstatus_data->mfd->panel_power_state == MDSS_PANEL_POWER_ON)) {
if (ret > 0)