diff options
| author | Ingrid Gallardo <ingridg@codeaurora.org> | 2016-08-18 19:38:13 -0700 |
|---|---|---|
| committer | Ingrid Gallardo <ingridg@codeaurora.org> | 2016-08-18 20:11:31 -0700 |
| commit | da1fa7ea2ea29d6ebf632c9960599be050d8e2e1 (patch) | |
| tree | 60cd42c495ae29541160f10bf85807eb8553787a | |
| parent | fa0dc60444f8a52470f5ff91db41d8bc09431de8 (diff) | |
msm: mdss: increase mdp hw recovery timeout
In some cases, display driver times out waiting
for the mdp hw recovery to complete, causing the
device to panic; however in some cases hw is
able to successfuly complete the recovery after
some more time.
This change increases the timeout, so driver
waits more time for the hw to complete the
recovery sequence.
CRs-Fixed: 1055875
Change-Id: I31909c45a4fec921da322658ec84d387d0f182ac
Signed-off-by: Ingrid Gallardo <ingridg@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp_ctl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_mdp_ctl.c b/drivers/video/fbdev/msm/mdss_mdp_ctl.c index 2218e9c4ac81..aa4cbfcc5acd 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_ctl.c +++ b/drivers/video/fbdev/msm/mdss_mdp_ctl.c @@ -4315,9 +4315,11 @@ void mdss_mdp_check_ctl_reset_status(struct mdss_mdp_ctl *ctl) return; pr_debug("hw ctl reset is set for ctl:%d\n", ctl->num); - status = mdss_mdp_poll_ctl_reset_status(ctl, 5); + /* poll for at least ~1 frame */ + status = mdss_mdp_poll_ctl_reset_status(ctl, 320); if (status) { - pr_err("hw recovery is not complete for ctl:%d\n", ctl->num); + pr_err("hw recovery is not complete for ctl:%d status:0x%x\n", + ctl->num, status); MDSS_XLOG_TOUT_HANDLER("mdp", "vbif", "vbif_nrt", "dbg_bus", "vbif_dbg_bus", "panic"); } |