From: 陈恒明 <chm@rock-chips.com>
Date: Tue, 10 Apr 2012 10:11:28 +0000 (+0800)
Subject: rk30: vpu_service: final solution of vpu hardware bug
X-Git-Tag: firefly_0821_release~9434
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e8d8e5ee346f2debf48eb263a61e3f55b0a918c6;p=firefly-linux-kernel-4.4.55.git

rk30: vpu_service: final solution of vpu hardware bug
---

diff --git a/arch/arm/plat-rk/vpu_service.c b/arch/arm/plat-rk/vpu_service.c
index 4ee63b967f3e..d59e8819b05c 100644
--- a/arch/arm/plat-rk/vpu_service.c
+++ b/arch/arm/plat-rk/vpu_service.c
@@ -449,9 +449,10 @@ void reg_copy_to_hw(vpu_reg *reg)
 	case VPU_ENC : {
 		u32 *dst = (u32 *)enc_dev.hwregs;
 #if defined(CONFIG_ARCH_RK30)
-		writel_relaxed(0, dec_dev.hwregs + DEC_INTERRUPT_REGISTER);
+		cru_set_soft_reset(SOFT_RST_CPU_VCODEC, true);
 		cru_set_soft_reset(SOFT_RST_VCODEC_AHB, true);
 		cru_set_soft_reset(SOFT_RST_VCODEC_AHB, false);
+		cru_set_soft_reset(SOFT_RST_CPU_VCODEC, false);
 #endif
 		service.reg_codec = reg;