summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHongzhang Yang <Hongzhang.Yang@freescale.com>2012-11-01 19:34:26 +0800
committerJason Liu <r64343@freescale.com>2012-11-01 19:55:25 +0800
commit1c8b759de7d82619ea5e54faedc788c8792f0bee (patch)
tree0013447ab368ff1037fe2e12f789d751e259406a
parent47006e9664c180bf5b00e53859fbf841df4c7edd (diff)
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>
-rw-r--r--drivers/mxc/vpu/mxc_vpu.c2
1 files changed, 2 insertions, 0 deletions
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.