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

vh265: fix crash for exit h265 player

Browse Source 
PD#164394:1) fix crash for exit h265 player
	  2) fix  tsdemux rrelease  bug which may cause system crash

Change-Id: Ibe30376cefae4d973ea906c8b0b698c9ac14e846
This commit is contained in:
wenbiao zhang
2018-04-16 16:10:06 +08:00
committed by Dongjin Kim
parent 58175e2f66
commit 889e0ebc2d
2 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8971,9 +8971,6 @@ static s32 vh265_init(struct hevc_state_s *hevc)
static int vh265_stop(struct hevc_state_s *hevc)
{
hevc->init_flag = 0;
if (get_dbg_flag(hevc) &
H265_DEBUG_WAIT_DECODE_DONE_WHEN_STOP) {
int wait_timeout_count = 0;
@@ -9019,15 +9016,11 @@ static int vh265_stop(struct hevc_state_s *hevc)
hevc_local_uninit(hevc);
if (use_cma) {
#ifdef USE_UNINIT_SEMA
int ret;
#endif
hevc->uninit_list = 1;
up(&h265_sema);
#ifdef USE_UNINIT_SEMA
if (hevc->init_flag) {
ret = down_interruptible(
&hevc->h265_uninit_done_sema);
down(&hevc->h265_uninit_done_sema);
}
#else
while (hevc->uninit_list) /* wait uninit complete */
@@ -9035,6 +9028,7 @@ static int vh265_stop(struct hevc_state_s *hevc)
#endif
}
hevc->init_flag = 0;
uninit_mmu_buffers(hevc);
amhevc_disable();
@@ -9115,8 +9109,6 @@ static unsigned char is_new_pic_available(struct hevc_state_s *hevc)
static int vmh265_stop(struct hevc_state_s *hevc)
{
hevc->init_flag = 0;
if (hevc->stat & STAT_TIMER_ARM) {
del_timer_sync(&hevc->timer);
hevc->stat &= ~STAT_TIMER_ARM;
@@ -9135,22 +9127,19 @@ static int vmh265_stop(struct hevc_state_s *hevc)
hevc_local_uninit(hevc);
if (use_cma) {
#ifdef USE_UNINIT_SEMA
int ret;
#endif
hevc->uninit_list = 1;
reset_process_time(hevc);
vdec_schedule_work(&hevc->work);
#ifdef USE_UNINIT_SEMA
if (hevc->init_flag) {
ret = down_interruptible(
&hevc->h265_uninit_done_sema);
down(&hevc->h265_uninit_done_sema);
}
#else
while (hevc->uninit_list) /* wait uninit complete */
msleep(20);
#endif
}
hevc->init_flag = 0;
cancel_work_sync(&hevc->work);
cancel_work_sync(&hevc->notify_work);
uninit_mmu_buffers(hevc);

12
drivers/amlogic/media_modules/stream_input/parser/tsdemux.c
View File

@@ -690,11 +690,6 @@ void tsdemux_release(void)
WRITE_PARSER_REG(PARSER_VIDEO_HOLE, 0);
WRITE_PARSER_REG(PARSER_AUDIO_HOLE, 0);
#ifdef CONFIG_AMLOGIC_MEDIA_MULTI_DEC
SET_PARSER_REG_MASK(PARSER_ES_CONTROL, ES_VID_MAN_RD_PTR);
WRITE_PARSER_REG(PARSER_VIDEO_WP, 0);
WRITE_PARSER_REG(PARSER_VIDEO_RP, 0);
#endif
/*TODO irq */
@@ -725,6 +720,13 @@ void tsdemux_release(void)
WRITE_RESET_REG(RESET1_REGISTER, RESET_PARSER);
#ifdef CONFIG_AMLOGIC_MEDIA_MULTI_DEC
SET_PARSER_REG_MASK(PARSER_ES_CONTROL, ES_VID_MAN_RD_PTR);
WRITE_PARSER_REG(PARSER_VIDEO_WP, 0);
WRITE_PARSER_REG(PARSER_VIDEO_RP, 0);
#endif
/* #if MESON_CPU_TYPE >= MESON_CPU_TYPE_MESON6 */
/*TODO clk */
/*