From: Hongzhang Yang <Hongzhang.Yang@freescale.com>
Date: Thu, 1 Nov 2012 11:34:26 +0000 (+0800)
Subject: ENGR00232087-2 VPU: Fix suspend/resume bugs
X-Git-Tag: v3.0.35-fsl~299
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ce8277ea3e5423157f2e646799bd221070c021ca;p=karo-tx-linux.git

ENGR00232087-2 VPU: Fix suspend/resume bugs

1. Fix ENGR00230203 [Android_MX6DL_SD] Gallery: System hang
after resume from suspend during video playback. 20%

2. Fix ENGR00231830 [MX6DL/S_SD] VPU: VPU encode can't
finish and print "VPU blocking: timeout." if suspend/resume. 100%

Signed-off-by: Hongzhang Yang <Hongzhang.Yang@freescale.com>
---

diff --git a/drivers/mxc/vpu/mxc_vpu.c b/drivers/mxc/vpu/mxc_vpu.c
index 6d77afb8a3d6..f473fdf681ba 100644
--- a/drivers/mxc/vpu/mxc_vpu.c
+++ b/drivers/mxc/vpu/mxc_vpu.c
@@ -874,6 +874,8 @@ static int vpu_resume(struct platform_device *pdev)
 
 		WRITE_REG(0x0, BIT_RESET_CTRL);
 		WRITE_REG(0x0, BIT_CODE_RUN);
+		/* MX6 RTL has a bug not to init MBC_SET_SUBBLK_EN on reset */
+		WRITE_REG(0x0, MBC_SET_SUBBLK_EN);
 
 		/*
 		 * Re-load boot code, from the codebuffer in external RAM.