From: hjc <hjc@rock-chips.com>
Date: Fri, 1 Aug 2014 02:22:20 +0000 (+0800)
Subject: rk3036 lcdc: update lcdc resume and suspend func
X-Git-Tag: firefly_0821_release~4916^2~91
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=891ec3717170c64232adaef0517aba14837f879b;p=firefly-linux-kernel-4.4.55.git

rk3036 lcdc: update lcdc resume and suspend func
---

diff --git a/drivers/video/rockchip/lcdc/rk3036_lcdc.c b/drivers/video/rockchip/lcdc/rk3036_lcdc.c
old mode 100644
new mode 100755
index e777cdfa9548..32e01b9de214
--- a/drivers/video/rockchip/lcdc/rk3036_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3036_lcdc.c
@@ -960,12 +960,10 @@ static int rk3036_lcdc_early_suspend(struct rk_lcdc_driver *dev_drv)
 		lcdc_msk_reg(lcdc_dev, SYS_CTRL, m_LCDC_STANDBY,
 			     v_LCDC_STANDBY(1));
 		lcdc_cfg_done(lcdc_dev);
-		#if defined(CONFIG_ROCKCHIP_IOMMU)
 		if (dev_drv->iommu_enabled) {
 			if (dev_drv->mmu_dev)
 				iovmm_deactivate(dev_drv->dev);
 		}
-		#endif
 		spin_unlock(&lcdc_dev->reg_lock);
 	} else {
 		spin_unlock(&lcdc_dev->reg_lock);
@@ -999,7 +997,10 @@ static int rk3036_lcdc_early_resume(struct rk_lcdc_driver *dev_drv)
 		lcdc_msk_reg(lcdc_dev, DSP_CTRL1, m_BLANK_EN,
 			     v_BLANK_EN(0));
 		lcdc_cfg_done(lcdc_dev);
-
+		if (dev_drv->iommu_enabled) {
+			if (dev_drv->mmu_dev)
+				iovmm_activate(dev_drv->dev);
+		}
 		spin_unlock(&lcdc_dev->reg_lock);
 	}