summaryrefslogtreecommitdiff
path: root/drivers/mxc
diff options
context:
space:
mode:
authorZhou Peng <eagle.zhou@nxp.com>2020-07-16 12:52:20 +0800
committerZhou Peng <eagle.zhou@nxp.com>2020-07-17 15:25:53 +0800
commit742c7adea8b19b047b6a5bce1c8d7da6895a3b71 (patch)
treeb7a18947259886c9d0ac3836073584438abb72f4 /drivers/mxc
parent0cd745bc3cb99ff3c0e7e204dd39c06c8ebf2b7c (diff)
MLK-24373-1 arm64: imx8mp: vpu: g1/g2: fix blocking issue in suspend
HW enable and disable are shared with the same function, driver need to check the parameter to identify whether HW is enabled or not Signed-off-by: Zhou Peng <eagle.zhou@nxp.com>
Diffstat (limited to 'drivers/mxc')
-rwxr-xr-xdrivers/mxc/hantro_845/hantrodec_845s.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mxc/hantro_845/hantrodec_845s.c b/drivers/mxc/hantro_845/hantrodec_845s.c
index d2b743a6c738..a72538687af3 100755
--- a/drivers/mxc/hantro_845/hantrodec_845s.c
+++ b/drivers/mxc/hantro_845/hantrodec_845s.c
@@ -771,7 +771,8 @@ static long DecFlushRegs(hantrodec_t *dev, struct core_desc *Core)
iowrite32(dev->dec_regs[i], dev->hwregs + i*4);
}
- dev->hw_active = 1;
+ if (dev->dec_regs[1] & 0x1)
+ dev->hw_active = 1;
/* write the status register, which may start the decoder */
iowrite32(dev->dec_regs[1], dev->hwregs + 4);