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

vh265: fix crash in task handle

Browse Source 
PD#168978

gHevc will free when module remove, but h265_task process is not quit,
and will run before kthread_run again. add task break after stop.

Change-Id: I3bb88801eb093c29237bf410221f5067f923f08d
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
This commit is contained in:
shihong.zheng
2018-07-09 10:45:57 +08:00
committed by Dongjin Kim
parent db300ca1de
commit 56d8cdee56
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8740,15 +8740,17 @@ static int h265_task_handle(void *data)
hevc_print(hevc, 0, "uninit list\n");
hevc->uninit_list = 0;
#ifdef USE_UNINIT_SEMA
if (use_cma && hevc->init_flag)
if (use_cma && hevc->init_flag) {
up(&hevc->h265_uninit_done_sema);
while (!kthread_should_stop())
msleep(1);
break;
}
#endif
}
}
return 0;
}
void vh265_free_cmabuf(void)
@@ -9287,6 +9289,10 @@ static int vh265_stop(struct hevc_state_s *hevc)
#ifdef USE_UNINIT_SEMA
if (hevc->init_flag) {
down(&hevc->h265_uninit_done_sema);
if (!IS_ERR(h265_task)) {
kthread_stop(h265_task);
h265_task = NULL;
}
}
#else
while (hevc->uninit_list) /* wait uninit complete */
@@ -10196,6 +10202,8 @@ static int amvdec_h265_remove(struct platform_device *pdev)
#endif
vfree(hevc);
hevc = NULL;
gHevc = NULL;
mutex_unlock(&vh265_mutex);