summaryrefslogtreecommitdiff
path: root/drivers/video/fbdev
diff options
context:
space:
mode:
authorPadmanabhan Komanduru <pkomandu@codeaurora.org>2013-11-12 12:16:08 +0530
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-23 20:23:21 -0700
commit91b9993e83b065f61e571f100b9a04fb2ba55503 (patch)
tree8e0c19245b9836bd12b0ecc986ebe53461bc86fa /drivers/video/fbdev
parentcb6b7609c6c2f04ec96b5db910dafbbde5ea1df9 (diff)
msm: mdss: Change wait_for_completion to timeout in MDSS DSI driver
In mdss_dsi_cmd_mdp_busy function in MDSS DSI driver, change the wait_for_completion to timeout variant. This avoids watchdog resets during stability tests. Change-Id: Ia85a5f61300e59382ae8dcf2ca67b5d7285a98e7 Signed-off-by: Padmanabhan Komanduru <pkomandu@codeaurora.org>
Diffstat (limited to 'drivers/video/fbdev')
-rw-r--r--drivers/video/fbdev/msm/mdss_dsi_host.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/fbdev/msm/mdss_dsi_host.c b/drivers/video/fbdev/msm/mdss_dsi_host.c
index 058695c49705..d4ac23771f6c 100644
--- a/drivers/video/fbdev/msm/mdss_dsi_host.c
+++ b/drivers/video/fbdev/msm/mdss_dsi_host.c
@@ -1751,7 +1751,9 @@ void mdss_dsi_cmd_mdp_busy(struct mdss_dsi_ctrl_pdata *ctrl)
/* wait until DMA finishes the current job */
pr_debug("%s: pending pid=%d\n",
__func__, current->pid);
- wait_for_completion(&ctrl->mdp_comp);
+ if (!wait_for_completion_timeout(&ctrl->mdp_comp,
+ msecs_to_jiffies(DMA_TX_TIMEOUT)))
+ pr_err("%s: timeout error\n", __func__);
}
pr_debug("%s: done pid=%d\n",
__func__, current->pid);