shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

media_module: add 265 non-mmu ucode support

Browse Source 
PD#170347: vh265:
	for multi-instances application . double write will be set to 0x10
for memory saving , (double write only mode), it must run under non-mmu
mode. so add non-mmu ucode to support it.
	ucode gerrit: 48398

Change-Id: I70d9c2186ceb03fb3eff28478548da571d265b4c
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
This commit is contained in:
Hui Zhang
2018-07-20 15:34:09 +08:00
committed by Dongjin Kim
parent 83f81c8481
commit 040fa9e2fe
2 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/amlogic/media_modules/frame_provider/decoder/h265/vh265.c
View File

@@ -9055,13 +9055,8 @@ static s32 vh265_init(struct hevc_state_s *hevc)
#endif
if (hevc->mmu_enable) {
if (get_cpu_major_id() >= AM_MESON_CPU_MAJOR_ID_G12A) {
size = get_firmware_data(VIDEO_DEC_HEVC, fw->data);
hevc_print(hevc, 0, "vh265 ucode loaded!\n");
} else {
size = get_firmware_data(VIDEO_DEC_HEVC_MMU, fw->data);
hevc_print(hevc, 0, "vh265 mmu ucode loaded!\n");
}
size = get_firmware_data(VIDEO_DEC_HEVC_MMU, fw->data);
hevc_print(hevc, 0, "vh265 mmu ucode loaded!\n");
} else {
size = get_firmware_data(VIDEO_DEC_HEVC, fw->data);
hevc_print(hevc, 0, "vh265 ucode loaded!\n");
@@ -9102,10 +9097,7 @@ static s32 vh265_init(struct hevc_state_s *hevc)
pr_info ("tee load ok");
if (hevc->mmu_enable) {
if (get_cpu_major_id() >= AM_MESON_CPU_MAJOR_ID_G12A)
ret = tee_load_video_fw((u32)VIDEO_DEC_HEVC, 0);
else
ret = tee_load_video_fw((u32)VIDEO_DEC_HEVC_MMU, 0);
ret = tee_load_video_fw((u32)VIDEO_DEC_HEVC_MMU, 0);
} else
ret = tee_load_video_fw((u32)VIDEO_DEC_HEVC, 0);
} else
@@ -9977,12 +9969,8 @@ static void run(struct vdec_s *vdec, unsigned long mask,
}
if (hevc->mmu_enable) {
if (get_cpu_major_id() >= AM_MESON_CPU_MAJOR_ID_G12A)
loadr = amhevc_vdec_loadmc_ex(vdec,
"vh265_mc", hevc->fw->data);
else
loadr = amhevc_vdec_loadmc_ex(vdec,
"vh265_mc_mmu", hevc->fw->data);
loadr = amhevc_vdec_loadmc_ex(vdec,
"vh265_mc_mmu", hevc->fw->data);
} else
loadr = amhevc_vdec_loadmc_ex(vdec,
"vh265_mc", hevc->fw->data);

BIN
firmware/video/video_ucode.bin Normal file → Executable file
View File

Binary file not shown.