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

media_module: single mode fw load failed issue [1/1]

Browse Source 
PD#SWPL-4263

Problem:
when run hevc stream mode first. then to run hevc single
mode. fw load failed. (vdec core no issue). the root cause
is that hevc dmc is disabled when hevc remove. it need to be
enabled before fw load. single mode missed it

Solution:
add hevc dmc enable before hevc fw load in single mode

Verify:
U212

Change-Id: Iad6a578b285d3a5fedc8d8b4da98af6a50d5b80b
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
This commit is contained in:
Hui Zhang
2019-01-16 12:30:36 +08:00
committed by Dongjin Kim
parent 0046660ba6
commit 195c001e7c
5 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/amlogic/media_modules/frame_provider/decoder/avs2/vavs2.c
View File

@@ -6338,7 +6338,7 @@ static s32 vavs2_init(struct vdec_s *vdec)
return 0;
}
hevc_enable_DMC(hw_to_vdec(dec));
amhevc_enable();
ret = amhevc_loadmc_ex(VFORMAT_AVS2, NULL, fw->data);

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

@@ -10590,6 +10590,7 @@ static s32 vh265_init(struct hevc_state_s *hevc)
return 0;
}
#endif
hevc_enable_DMC(hw_to_vdec(hevc));
amhevc_enable();
if (hevc->mmu_enable)

11
drivers/amlogic/media_modules/frame_provider/decoder/utils/vdec.c
View File

@@ -3563,6 +3563,17 @@ void vdec_reset_core(struct vdec_s *vdec)
}
EXPORT_SYMBOL(vdec_reset_core);
void hevc_enable_DMC(struct vdec_s *vdec)
{
unsigned long flags;
spin_lock_irqsave(&vdec_spin_lock, flags);
codec_dmcbus_write(DMC_REQ_CTRL,
codec_dmcbus_read(DMC_REQ_CTRL) | (1 << 4));
spin_unlock_irqrestore(&vdec_spin_lock, flags);
}
EXPORT_SYMBOL(hevc_enable_DMC);
void hevc_reset_core(struct vdec_s *vdec)
{
unsigned long flags;

1
drivers/amlogic/media_modules/frame_provider/decoder/utils/vdec.h
View File

@@ -421,6 +421,7 @@ extern void vdec_set_step_mode(void);
extern void vdec_disable_DMC(struct vdec_s *vdec);
extern void vdec_enable_DMC(struct vdec_s *vdec);
extern void hevc_enable_DMC(struct vdec_s *vdec);
int vdec_read_user_data(struct vdec_s *vdec,
struct userdata_param_t *p_userdata_param);

2
drivers/amlogic/media_modules/frame_provider/decoder/vp9/vvp9.c
View File

@@ -8099,7 +8099,7 @@ static s32 vvp9_init(struct VP9Decoder_s *pbi)
return 0;
}
#endif
hevc_enable_DMC(hw_to_vdec(pbi));
amhevc_enable();
ret = amhevc_loadmc_ex(VFORMAT_VP9, NULL, fw->data);