From: Shen Zhenyi <szy@rock-chips.com>
Date: Wed, 30 Sep 2015 09:40:46 +0000 (+0800)
Subject: video: rockchip: lcdc: 3288: set iommu_status to 0, when all layer closed
X-Git-Tag: firefly_0821_release~3735
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=172981dc8955170dd851910b7179710f073a7d21;p=firefly-linux-kernel-4.4.55.git

video: rockchip: lcdc: 3288: set iommu_status to 0, when all layer closed

Change-Id: I494c54017be89e48836870f015f420a0c148c980
Signed-off-by: Shen Zhenyi <szy@rock-chips.com>
---

diff --git a/drivers/video/rockchip/lcdc/rk3288_lcdc.c b/drivers/video/rockchip/lcdc/rk3288_lcdc.c
index ee58413eec3d..09ba332ca2d7 100755
--- a/drivers/video/rockchip/lcdc/rk3288_lcdc.c
+++ b/drivers/video/rockchip/lcdc/rk3288_lcdc.c
@@ -1610,8 +1610,10 @@ static int rk3288_lcdc_open(struct rk_lcdc_driver *dev_drv, int win_id,
 		rk3288_lcdc_reg_update(dev_drv);
 #if defined(CONFIG_ROCKCHIP_IOMMU)
 		if (dev_drv->iommu_enabled) {
-			if (dev_drv->mmu_dev)
+			if (dev_drv->mmu_dev) {
 				rockchip_iovmm_deactivate(dev_drv->dev);
+				lcdc_dev->iommu_status = 0;
+			}
 		}
 #endif
 		rk3288_lcdc_clk_disable(lcdc_dev);