| author | peter wang <peter.wang@amlogic.com> | 2019-03-15 10:18:40 (GMT) |
|---|---|---|
| committer | Shen Liu <shen.liu@amlogic.com> | 2019-04-02 05:25:27 (GMT) |
| commit | f8685fdc0fbaa36a9e3045833186101fdfba0d3f (patch) | |
| tree | 81fd29f47820c2310343b02fc3714cb22a9c3e25 | |
| parent | 03de3422f4a004832344c601aacd61ef9175143f (diff) | |
| download | media_modules-f8685fdc0fbaa36a9e3045833186101fdfba0d3f.zip media_modules-f8685fdc0fbaa36a9e3045833186101fdfba0d3f.tar.gz media_modules-f8685fdc0fbaa36a9e3045833186101fdfba0d3f.tar.bz2 | |
vmh264: fix alloc memory failed on cts accuracy test [1/1]
PD#SWPL-5281
Problem:
test cts android.media.cts.DecodeAccuracyTest have failed cases
Solution:
disable mmu when using ionvideo
Verify:
verified on local
Change-Id: I41a0ec051810369a69f2a7dce29fb6a913593445
Signed-off-by: peter wang <peter.wang@amlogic.com>
| -rw-r--r-- | drivers/frame_provider/decoder/h264_multi/vmh264.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/frame_provider/decoder/h264_multi/vmh264.c b/drivers/frame_provider/decoder/h264_multi/vmh264.c index 471f8db..17b4a1a 100644 --- a/drivers/frame_provider/decoder/h264_multi/vmh264.c +++ b/drivers/frame_provider/decoder/h264_multi/vmh264.c @@ -7671,6 +7671,14 @@ static int ammvdec_h264_probe(struct platform_device *pdev) (pdata->sys_info->height * pdata->sys_info->width > 1920 * 1088)) hw->mmu_enable = 1; + + if (hw->mmu_enable && + (pdata->frame_base_video_path == FRAME_BASE_PATH_IONVIDEO)) { + hw->mmu_enable = 0; + pr_info("ionvideo needs disable mmu, path= %d \n", + pdata->frame_base_video_path); + } + if (ammvdec_h264_mmu_init(hw)) { h264_free_hw_stru(&pdev->dev, (void *)hw); pr_info("\nammvdec_h264 mmu alloc failed!\n"); |