From: ljf <ljf@rock-chips.com>
Date: Thu, 15 May 2014 07:24:45 +0000 (+0800)
Subject: rk3288: deactivate iommu before power off, get rid of warnning from iommu module
X-Git-Tag: firefly_0821_release~5273
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8449a93af7e4569639b8d94699c720b8b93956b0;p=firefly-linux-kernel-4.4.55.git

rk3288: deactivate iommu before power off, get rid of warnning from iommu module
---

diff --git a/arch/arm/mach-rockchip/vcodec_service.c b/arch/arm/mach-rockchip/vcodec_service.c
index 4b7ee70ccdc6..14b1a5b15055 100755
--- a/arch/arm/mach-rockchip/vcodec_service.c
+++ b/arch/arm/mach-rockchip/vcodec_service.c
@@ -551,6 +551,12 @@ static void vpu_service_power_off(struct vpu_service_info *pservice)
         pr_alert("alert: delay 50 ms for running task\n");
         vpu_service_dump(pservice);
     }
+    
+#if defined(CONFIG_VCODEC_MMU)
+    if (pservice->mmu_dev) {
+        iovmm_deactivate(pservice->dev);
+    }
+#endif 
 
     printk("%s: power off...", dev_name(pservice->dev));
     udelay(10);
@@ -565,12 +571,6 @@ static void vpu_service_power_off(struct vpu_service_info *pservice)
 #endif
     wake_unlock(&pservice->wake_lock);
     printk("done\n");
-    
-#if defined(CONFIG_VCODEC_MMU)
-    if (pservice->mmu_dev) {
-        iovmm_deactivate(pservice->dev);
-    }
-#endif    
 }
 
 static inline void vpu_queue_power_off_work(struct vpu_service_info *pservice)