Merge "msm: mdss: fix mdp suspend/resume sequence"
diff --git a/drivers/video/msm/mdss/mdss_fb.c b/drivers/video/msm/mdss/mdss_fb.c
index 06d8769..3bef9b3 100644
--- a/drivers/video/msm/mdss/mdss_fb.c
+++ b/drivers/video/msm/mdss/mdss_fb.c
@@ -326,7 +326,6 @@
struct fb_info *fbi;
int ret, i;
int result = 0;
- console_lock();
for (i = 0; i < fbi_list_index; i++) {
fbi = fbi_list[i];
fb_set_suspend(fbi, FBINFO_STATE_SUSPENDED);
@@ -337,7 +336,6 @@
result = ret;
}
}
- console_unlock();
return result;
}
@@ -347,7 +345,6 @@
int ret, i;
int result = 0;
- console_lock();
for (i = 0; i < fbi_list_index; i++) {
fbi = fbi_list[i];
@@ -355,7 +352,6 @@
if (ret == 0)
fb_set_suspend(fbi, FBINFO_STATE_RUNNING);
}
- console_unlock();
return result;
}
diff --git a/drivers/video/msm/mdss/mdss_mdp.c b/drivers/video/msm/mdss/mdss_mdp.c
index 3fb70bd..63df84c 100644
--- a/drivers/video/msm/mdss/mdss_mdp.c
+++ b/drivers/video/msm/mdss/mdss_mdp.c
@@ -931,11 +931,11 @@
mutex_lock(&mdp_suspend_mutex);
mdss_res->suspend = false;
mutex_unlock(&mdp_suspend_mutex);
+ mdss_hw_init(mdata);
ret = mdss_fb_resume_all();
if (IS_ERR_VALUE(ret))
pr_err("Unable to resume all fb panels (%d)\n", ret);
- mdss_hw_init(mdata);
return ret;
}
#else
diff --git a/drivers/video/msm/mdss/mdss_mdp_ctl.c b/drivers/video/msm/mdss/mdss_mdp_ctl.c
index 872b6c4..f72ff8d 100644
--- a/drivers/video/msm/mdss/mdss_mdp_ctl.c
+++ b/drivers/video/msm/mdss/mdss_mdp_ctl.c
@@ -494,6 +494,11 @@
}
ctl = mfd->ctl;
+ if (ctl->power_on) {
+ WARN(1, "already on!\n");
+ return 0;
+ }
+
mutex_lock(&ctl->lock);
ctl->power_on = true;
@@ -571,8 +576,19 @@
ctl = mfd->ctl;
+ if (!ctl->power_on) {
+ WARN(1, "already off!\n");
+ return 0;
+ }
+
pr_debug("ctl_num=%d\n", mfd->ctl->num);
+ mdss_mdp_overlay_release_all(mfd);
+
+ /* request bus bandwidth for panel commands */
+ ctl->bus_ib_quota = SZ_1M;
+ mdss_mdp_ctl_perf_commit(MDSS_MDP_PERF_UPDATE_ALL);
+
mutex_lock(&ctl->lock);
ctl->power_on = false;
@@ -602,8 +618,6 @@
mutex_unlock(&ctl->lock);
- mdss_mdp_overlay_release_all(mfd);
-
if (!mfd->ref_cnt)
mdss_mdp_ctl_destroy(mfd);
diff --git a/drivers/video/msm/mdss/mdss_mdp_intf_video.c b/drivers/video/msm/mdss/mdss_mdp_intf_video.c
index 5d8dd86..fed7d21 100644
--- a/drivers/video/msm/mdss/mdss_mdp_intf_video.c
+++ b/drivers/video/msm/mdss/mdss_mdp_intf_video.c
@@ -274,6 +274,7 @@
}
if (ctx->timegen_en) {
+ INIT_COMPLETION(ctx->pp_comp);
pr_debug("waiting for ping pong %d done\n", ctx->pp_num);
mdss_mdp_irq_enable(MDSS_MDP_IRQ_PING_PONG_COMP, ctx->pp_num);
wait_for_completion_interruptible(&ctx->pp_comp);
@@ -312,7 +313,7 @@
wmb();
}
- wait_for_completion_interruptible(&ctx->vsync_comp);
+ wait_for_completion(&ctx->vsync_comp);
if (!ctx->vsync_handler)
mdss_mdp_irq_disable(MDSS_MDP_IRQ_INTF_VSYNC, ctl->intf_num);
mutex_unlock(&ctx->vsync_lock);