| author | Nanxin Qin <nanxin.qin@amlogic.com> | 2019-12-23 08:37:33 (GMT) |
|---|---|---|
| committer | Zhi Zhou <zhi.zhou@amlogic.com> | 2019-12-24 03:16:28 (GMT) |
| commit | 85da061765fee5c9b64b4db65ea1a33ea3b3a744 (patch) | |
| tree | dabba6ab91896fc07ff7a6b9d49fdfa51f09f2b0 | |
| parent | 263871cdb5c145691398cebf537aa5d1f1c71b99 (diff) | |
| download | media_modules-85da061765fee5c9b64b4db65ea1a33ea3b3a744.zip media_modules-85da061765fee5c9b64b4db65ea1a33ea3b3a744.tar.gz media_modules-85da061765fee5c9b64b4db65ea1a33ea3b3a744.tar.bz2 | |
decode: fixed the kernel crash when testing sts. [1/1]
PD#SWPL-18697
Problem:
CtsSecurityTestCases 2 fail
Solution:
fixed the kernel crash when testing sts
Verify:
u212
Change-Id: Ic7ec31daadb4c2374f1527db5b355b14e85549b3
Signed-off-by: Nanxin Qin <nanxin.qin@amlogic.com>
| -rw-r--r-- | drivers/frame_provider/decoder/h265/vh265.c | 3 | ||||
| -rw-r--r-- | drivers/frame_provider/decoder/vp9/vvp9.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/frame_provider/decoder/h265/vh265.c b/drivers/frame_provider/decoder/h265/vh265.c index 65295a6..8c4a9ab 100644 --- a/drivers/frame_provider/decoder/h265/vh265.c +++ b/drivers/frame_provider/decoder/h265/vh265.c @@ -2603,7 +2603,8 @@ static int get_free_buf_idx(struct hevc_state_s *hevc) if (pic->output_mark == 0 && pic->referenced == 0 && - pic->output_ready == 0) { + pic->output_ready == 0 && + pic->cma_alloc_addr) { pic->output_ready = 1; index = i; break; diff --git a/drivers/frame_provider/decoder/vp9/vvp9.c b/drivers/frame_provider/decoder/vp9/vvp9.c index d980116..d227e15 100644 --- a/drivers/frame_provider/decoder/vp9/vvp9.c +++ b/drivers/frame_provider/decoder/vp9/vvp9.c @@ -7290,7 +7290,7 @@ static int notify_v4l_eos(struct vdec_s *vdec) if (hw->is_used_v4l && hw->eos) { expires = jiffies + msecs_to_jiffies(2000); - while (INVALID_IDX == (index = get_free_fb(hw))) { + while (INVALID_IDX == (index = v4l_get_free_fb(hw))) { if (time_after(jiffies, expires)) break; } |