From 891ec3717170c64232adaef0517aba14837f879b Mon Sep 17 00:00:00 2001 From: hjc Date: Fri, 1 Aug 2014 10:22:20 +0800 Subject: [PATCH] rk3036 lcdc: update lcdc resume and suspend func --- drivers/video/rockchip/lcdc/rk3036_lcdc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 drivers/video/rockchip/lcdc/rk3036_lcdc.c 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); } -- 2.34.1