From: ljf Date: Fri, 7 Nov 2014 07:15:50 +0000 (+0800) Subject: add protect mutex when activate iommu device. coresponse to iommu X-Git-Tag: firefly_0821_release~4488 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7d9d350eac5045436c5d9da71073dda155235f79;p=firefly-linux-kernel-4.4.55.git add protect mutex when activate iommu device. coresponse to iommu modify. Signed-off-by: ljf --- diff --git a/arch/arm/mach-rockchip/vcodec_service.c b/arch/arm/mach-rockchip/vcodec_service.c index 1ecf9c77249d..246db4f9524c 100755 --- a/arch/arm/mach-rockchip/vcodec_service.c +++ b/arch/arm/mach-rockchip/vcodec_service.c @@ -755,8 +755,11 @@ static void vpu_service_power_on(struct vpu_service_info *pservice) wake_lock(&pservice->wake_lock); #if defined(CONFIG_VCODEC_MMU) - if (pservice->mmu_dev) - rockchip_iovmm_activate(pservice->dev); + if (pservice->mmu_dev) { + vcodec_enter_mode(pservice->dev_id); + rockchip_iovmm_activate(pservice->dev); + vcodec_exit_mode(); + } #endif }