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 6d77afb8a3d60f950d3c9eee8716626ed4a83b00..f473fdf681ba43598e59770914efd11b3be6b7b1 100644 (file)
--- 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.