summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJayant Shekhar <jshekhar@codeaurora.org>2015-10-25 20:45:47 +0530
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 21:12:19 -0700
commite50765b455de755643c60db58b033a36960ee9fb (patch)
tree6b54eba2b890e20bbc85c3fe0bd40be0b903d162
parent6b565db34e579c5f4ce17bda970be11e4b0d1d49 (diff)
msm: mdss: ensure ctl flush in case of fence timeout
In the current composition cycle, if the staging params are not changed, then currently MDP flush register is not configured. But due to any unforeseen reason if MDP fence timeout happens then to handle it gracefully we stage border fill. In this regard as the mixer config has now changed, then ctl flush has to be set. Change-Id: I24b9cb28426f8829ac3bb36bfa32859b588d06fd Signed-off-by: Jayant Shekhar <jshekhar@codeaurora.org>
-rw-r--r--drivers/video/fbdev/msm/mdss_mdp_ctl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c
index 1e76416fe80c..1d24101b75d3 100644
--- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c
+++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c
@@ -5029,6 +5029,9 @@ int mdss_mdp_display_commit(struct mdss_mdp_ctl *ctl, void *arg,
*/
if (ret == NOTIFY_BAD) {
mdss_mdp_force_border_color(ctl);
+ ctl_flush_bits |= (ctl->flush_bits | BIT(17));
+ if (sctl && (!ctl->split_flush_en))
+ sctl_flush_bits |= (sctl->flush_bits | BIT(17));
ret = 0;
}