summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/video/fbdev/msm/dsi_status_6g.c2
-rw-r--r--drivers/video/fbdev/msm/mdss_dsi_status.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/dsi_status_6g.c b/drivers/video/fbdev/msm/dsi_status_6g.c
index fcd8d8976f72..75d62e072c85 100644
--- a/drivers/video/fbdev/msm/dsi_status_6g.c
+++ b/drivers/video/fbdev/msm/dsi_status_6g.c
@@ -77,7 +77,7 @@ void mdss_check_dsi_ctrl_status(struct work_struct *work, uint32_t interval)
mutex_lock(ctl->shared_lock);
mutex_lock(&mdp5_data->ov_lock);
- if (pstatus_data->mfd->shutdown_pending) {
+ if (mdss_panel_is_power_off(pstatus_data->mfd->panel_power_state)) {
mutex_unlock(&mdp5_data->ov_lock);
if (ctl->shared_lock)
mutex_unlock(ctl->shared_lock);
diff --git a/drivers/video/fbdev/msm/mdss_dsi_status.c b/drivers/video/fbdev/msm/mdss_dsi_status.c
index f0fe7c07391c..37cf523bd722 100644
--- a/drivers/video/fbdev/msm/mdss_dsi_status.c
+++ b/drivers/video/fbdev/msm/mdss_dsi_status.c
@@ -60,6 +60,11 @@ static void check_dsi_ctrl_status(struct work_struct *work)
return;
}
+ if (mdss_panel_is_power_off(pdsi_status->mfd->panel_power_state)) {
+ pr_err("%s: panel off\n", __func__);
+ return;
+ }
+
pdsi_status->mfd->mdp.check_dsi_status(work, interval);
}