commit 8ac5b9c3ba3cbfeaaf872e400b30c22b6fc8b609
author Linux Build Service Account <lnxbuild@localhost> Wed Jun 18 16:24:50 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jun 18 16:24:49 2014 -0700
tree 4bbd8fe51b03a1d95050c9d259652c1b1d9b6ea7
parent 81e70b7258d91cdc568c1a0d3c144da310c1e7fa
parent c18c725d4c29d204646d76ba233a0080204c4bb5

Merge "msm: mdss: Avoid unclocked register access with dsi_event_thread"

drivers/video/msm/mdss/mdss_dsi_host.c

diff --git a/drivers/video/msm/mdss/mdss_dsi_host.c b/drivers/video/msm/mdss/mdss_dsi_host.c
index 72cb8d5..457deb7 100644
--- a/drivers/video/msm/mdss/mdss_dsi_host.c
+++ b/drivers/video/msm/mdss/mdss_dsi_host.c
@@ -1380,8 +1380,10 @@
 
 		if (todo & DSI_EV_MDP_FIFO_UNDERFLOW) {
 			if (ctrl->recovery) {
+				mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 1);
 				mdss_dsi_sw_reset_restore(ctrl);
 				ctrl->recovery->fxn(ctrl->recovery->data);
+				mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 0);
 			}
 		}
 
@@ -1396,7 +1398,9 @@
 			spin_unlock_irqrestore(&ctrl->mdp_lock, flag);
 
 			/* enable dsi error interrupt */
+			mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 1);
 			mdss_dsi_err_intr_ctrl(ctrl, DSI_INTR_ERROR_MASK, 1);
+			mdss_dsi_clk_ctrl(ctrl, DSI_ALL_CLKS, 0);
 		}
 
 	}