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

vh264: wait for hw stop before reset when poor signal condition [1/1]

Browse Source 
PD#SWPL-5014

Problem:
decoder crash or bus locked when h264 poor signal

Solution:
wait for hw stop nefore local reset

Verify:
X301

Change-Id: I7c4bfa29fdb52d8af83299cdd795f9394be7773e
Signed-off-by: Hui Zhang <hui.zhang@amlogic.com>
This commit is contained in:
Hui Zhang
2019-02-28 14:16:45 +08:00
committed by Dongjin Kim
parent 4cb94b48d9
commit 1a243c9c81
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/amlogic/media_modules/frame_provider/decoder/h264/vh264.c
View File

@@ -2838,9 +2838,27 @@ static int vh264_stop(int mode)
return 0;
}
static void wait_vh264_search_done(void)
{
u32 vld_rp = READ_VREG(VLD_MEM_VIFIFO_RP);
int count = 0;
do {
usleep_range(100, 500);
if (vld_rp == READ_VREG(VLD_MEM_VIFIFO_RP))
break;
if (count > 2000) {
pr_info("%s, timeout count %d vld_rp 0x%x VLD_MEM_VIFIFO_RP 0x%x\n",
__func__, count, vld_rp, READ_VREG(VLD_MEM_VIFIFO_RP));
break;
} else
vld_rp = READ_VREG(VLD_MEM_VIFIFO_RP);
count++;
} while (1);
}
static void error_do_work(struct work_struct *work)
{
mutex_lock(&vh264_mutex);
/*
* we need to lock vh264_stop/vh264_init.
@@ -2851,8 +2869,9 @@ static void error_do_work(struct work_struct *work)
if (atomic_read(&vh264_active)) {
amvdec_stop();
do {
msleep(20);
msleep(50);
} while (vh264_stream_switching_state != SWITCHING_STATE_OFF);
wait_vh264_search_done();
vh264_reset = 1;
#ifdef CONFIG_AMLOGIC_POST_PROCESS_MANAGER
vh264_ppmgr_reset();
@@ -2863,14 +2882,10 @@ static void error_do_work(struct work_struct *work)
vf_reg_provider(&vh264_vf_prov);
#endif
msleep(30);
vh264_prot_init();
amvdec_start();
vh264_reset = 0;
}
mutex_unlock(&vh264_mutex);
}
static void stream_switching_done(void)