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

vdec: fixed stuck when exit from single mode [1/1]

Browse Source 
PD#SWPL-4049

Problem:
image stuck for 10 seconds before exiting movieplayer

Solution:
do not set single mode last_vdec in vdec init

Verify:
u212

Change-Id: I0aeeb13f1a1db8ea239b125f1d49fee214c7f5b5
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
This commit is contained in:
shihong.zheng
2019-01-10 22:20:05 +08:00
committed by Dongjin Kim
parent 665fc40733
commit f3aec06931
8 changed files with 27 additions and 38 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

@@ -4425,7 +4425,7 @@ static int avs2_prepare_display_buf(struct AVS2Decoder_s *dec)
if (vf) {
set_vframe(dec, vf, pic, 0);
decoder_do_frame_check(vf, CORE_MASK_HEVC);
decoder_do_frame_check(hw_to_vdec(dec), vf);
kfifo_put(&dec->display_q, (const struct vframe_s *)vf);
#ifndef CONFIG_AMLOGIC_MEDIA_MULTI_DEC

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

@@ -1913,7 +1913,7 @@ static void vh264_isr(void)
decoder_bmmu_box_get_mem_handle(
mm_blk_handle,
VF_BUFFER_IDX(buffer_index));
decoder_do_frame_check(vf, CORE_MASK_VDEC_1);
decoder_do_frame_check(NULL, vf);
if ((error_recovery_mode_use & 2) && error) {
kfifo_put(&recycle_q,
(const struct vframe_s *)vf);
@@ -1964,7 +1964,7 @@ static void vh264_isr(void)
decoder_bmmu_box_get_mem_handle(
mm_blk_handle,
VF_BUFFER_IDX(buffer_index));
decoder_do_frame_check(vf, CORE_MASK_VDEC_1);
decoder_do_frame_check(NULL, vf);
if ((error_recovery_mode_use & 2) && error) {
kfifo_put(&recycle_q,
(const struct vframe_s *)vf);
@@ -2105,7 +2105,7 @@ static void vh264_isr(void)
p_last_vf = vf;
pts_discontinue = false;
iponly_early_mode = 1;
decoder_do_frame_check(vf, CORE_MASK_VDEC_1);
decoder_do_frame_check(NULL, vf);
kfifo_put(&delay_display_q,
(const struct vframe_s *)vf);
WRITE_VREG(AV_SCRATCH_0, 0);

4
drivers/amlogic/media_modules/frame_provider/decoder/h264_multi/vmh264.c
View File

@@ -2566,9 +2566,9 @@ int prepare_display_buf(struct vdec_s *vdec, struct FrameStore *frame)
if (i == 0) {
if (hw->mmu_enable)
decoder_do_frame_check(vf, CORE_MASK_VDEC_1 | CORE_MASK_HEVC);
decoder_do_frame_check(hw_to_vdec(hw), vf);
else
decoder_do_frame_check(vf, CORE_MASK_VDEC_1);
decoder_do_frame_check(hw_to_vdec(hw), vf);
}
kfifo_put(&hw->display_q, (const struct vframe_s *)vf);

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

@@ -7520,7 +7520,7 @@ static int prepare_display_buf(struct hevc_state_s *hevc, struct PIC_s *pic)
vf->type_original = vf->type;
pic->vf_ref = 1;
hevc->vf_pre_count++;
decoder_do_frame_check(vf, CORE_MASK_HEVC);
decoder_do_frame_check(hw_to_vdec(hevc), vf);
kfifo_put(&hevc->display_q, (const struct vframe_s *)vf);
if (get_dbg_flag(hevc) & H265_DEBUG_PIC_STRUCT)

20
drivers/amlogic/media_modules/frame_provider/decoder/utils/frame_check.c
View File

@@ -669,14 +669,22 @@ static int fbc_check_prepare(struct pic_check_t *check,
return 0;
}
int decoder_do_frame_check(struct vframe_s *vf, int core_mask)
static struct vdec_s *single_mode_vdec = NULL;
int decoder_do_frame_check(struct vdec_s *vdec, struct vframe_s *vf)
{
int ret = 0;
int resize = 0;
void *planes[4];
struct pic_check_t *check = NULL;
struct pic_check_mgr_t *mgr =
(struct pic_check_mgr_t *)vdec_get_active_vfc(core_mask);
struct pic_check_mgr_t *mgr = NULL;
if (vdec == NULL) {
if (single_mode_vdec == NULL)
return 0;
mgr = &single_mode_vdec->vfc;
} else
mgr = &vdec->vfc;
if ((mgr == NULL) ||
(vf == NULL) ||
@@ -896,6 +904,7 @@ static unsigned int yuv_enable, check_enable;
static unsigned int yuv_start[MAX_INSTANCE_MUN];
static unsigned int yuv_num[MAX_INSTANCE_MUN];
int vdec_frame_check_init(struct vdec_s *vdec)
{
int ret = 0, id = 0;
@@ -907,6 +916,9 @@ int vdec_frame_check_init(struct vdec_s *vdec)
if (!check_enable && !yuv_enable)
return 0;
if (vdec_single(vdec))
single_mode_vdec = vdec;
vdec->canvas_mode = CANVAS_BLKMODE_LINEAR;
id = vdec->id;
@@ -938,6 +950,8 @@ void vdec_frame_check_exit(struct vdec_s *vdec)
if (vdec == NULL)
return;
frame_check_exit(&vdec->vfc);
single_mode_vdec = NULL;
}
ssize_t dump_yuv_store(struct class *class,

2
drivers/amlogic/media_modules/frame_provider/decoder/utils/frame_check.h
View File

@@ -83,7 +83,7 @@ struct pic_check_mgr_t{
int dump_yuv_trig(struct pic_check_mgr_t *mgr,
int id, int start, int num);
int decoder_do_frame_check(struct vframe_s *vf, int core_mask);
int decoder_do_frame_check(struct vdec_s *vdec, struct vframe_s *vf);
int frame_check_init(struct pic_check_mgr_t *mgr, int id);

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

@@ -1632,28 +1632,6 @@ struct vdec_s *vdec_get_with_id(unsigned id)
return ret_vdec;
}
void *vdec_get_active_vfc(int core_mask)
{
void *p = NULL;
struct vdec_s *vdec = vdec_core->last_vdec;
if (vdec_core->parallel_dec == 1) {
if (core_mask & CORE_MASK_VDEC_1)
vdec = vdec_core->active_vdec;
else if (core_mask & CORE_MASK_HEVC)
vdec = vdec_core->active_hevc;
else
vdec = vdec_core->last_vdec;
}
if (vdec == NULL)
return NULL;
p = &vdec->vfc;
return p;
}
/*
*register vdec_device
* create output, vfm or create ionvideo output
@@ -1714,8 +1692,6 @@ s32 vdec_init(struct vdec_s *vdec, int is_4k)
vdec_core->parallel_dec = parallel_decode;
vdec->canvas_mode = CANVAS_BLKMODE_32X32;
#ifdef FRAME_CHECK
if (vdec_single(vdec))
vdec_core->last_vdec = vdec;
vdec_frame_check_init(vdec);
#endif
p->dev = platform_device_register_data(
@@ -1957,9 +1933,8 @@ void vdec_release(struct vdec_s *vdec)
#ifdef FRAME_CHECK
vdec_frame_check_exit(vdec);
if (vdec_single(vdec))
vdec_core->active_vdec = NULL;
#endif
platform_device_unregister(vdec->dev);
pr_debug("vdec_release instance %p, total %d\n", vdec,
atomic_read(&vdec_core->vdec_nr));

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

@@ -6878,7 +6878,7 @@ static int prepare_display_buf(struct VP9Decoder_s *pbi,
&& (debug & VP9_DEBUG_NO_TRIGGER_FRAME) == 0
)) {
inc_vf_ref(pbi, pic_config->index);
decoder_do_frame_check(vf, CORE_MASK_HEVC);
decoder_do_frame_check(hw_to_vdec(pbi), vf);
kfifo_put(&pbi->display_q, (const struct vframe_s *)vf);
pbi->vf_pre_count++;
#ifndef CONFIG_AMLOGIC_MEDIA_MULTI_DEC