From: hjc <hjc@rock-chips.com>
Date: Thu, 26 Feb 2015 10:27:40 +0000 (+0800)
Subject: rk fb: if uboot-logo-on set 1, open iommu when iommu en
X-Git-Tag: firefly_0821_release~4158^2~442
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ea74dadc77898a3fbc17e50abca935e9b480e422;p=firefly-linux-kernel-4.4.55.git

rk fb: if uboot-logo-on set 1, open iommu when iommu en

Signed-off-by: hjc <hjc@rock-chips.com>
---

diff --git a/drivers/video/rockchip/rk_fb.c b/drivers/video/rockchip/rk_fb.c
old mode 100644
new mode 100755
index 25fa86b2a097..ebe1aace5eb6
--- a/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c
@@ -3756,9 +3756,12 @@ int rk_fb_register(struct rk_lcdc_driver *dev_drv,
 			}
 			return 0;
 		} else {
-			if (dev_drv->ops->mmu_en)
-				dev_drv->ops->mmu_en(dev_drv);
-			freed_index = 0;
+			if (dev_drv->iommu_enabled) {
+				rk_fb_poll_wait_frame_complete();
+				if (dev_drv->ops->mmu_en)
+					dev_drv->ops->mmu_en(dev_drv);
+				freed_index = 0;
+			}
 		}
 #if defined(CONFIG_LOGO)
 		main_fbi->fbops->fb_set_par(main_fbi);