commit d3c80faa66fbfb1f42d0b9fba1407d7c5d5428e4
author Linux Build Service Account <lnxbuild@localhost> Thu Nov 13 07:51:58 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Nov 13 07:51:58 2014 -0800
tree 8a4f609614c683add090b32798bc6b63ec9abf55
parent 5480f7ac3f34a8be98f7083f80974864e108f1e3
parent 589ef4098aa34bf0fca252614d4df3ac7c5c234e

Merge "msm: mdss: Move iommu attach after overlay start in pan display"

drivers/video/msm/mdss/mdss_mdp_overlay.c

diff --git a/drivers/video/msm/mdss/mdss_mdp_overlay.c b/drivers/video/msm/mdss/mdss_mdp_overlay.c
index cff668d..e5965e6 100644
--- a/drivers/video/msm/mdss/mdss_mdp_overlay.c
+++ b/drivers/video/msm/mdss/mdss_mdp_overlay.c
@@ -1747,11 +1747,6 @@
 
 	mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
 
-	ret = mdss_iommu_ctrl(1);
-	if (IS_ERR_VALUE(ret)) {
-		pr_err("IOMMU attach failed\n");
-		goto pan_display_error;
-	}
 
 	bpp = fbi->var.bits_per_pixel / 8;
 	offset = fbi->var.xoffset * bpp +
@@ -1769,6 +1764,12 @@
 		goto pan_display_error;
 	}
 
+	ret = mdss_iommu_ctrl(1);
+	if (IS_ERR_VALUE(ret)) {
+		pr_err("IOMMU attach failed\n");
+		goto pan_display_error;
+	}
+
 	ret = mdss_mdp_overlay_get_fb_pipe(mfd, &pipe,
 					MDSS_MDP_MIXER_MUX_LEFT);
 	if (ret) {