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

decoder: fixed some vp9 avs2 8k problem [1/1]

Browse Source 
PD#SWPL-2971

Problem:
1. some vp9 8k video display abnormal.
2. avs2 consume mem excessive and mosaic and crash
   when play avs2 8192x4608 bitdepth 10 bitstream.

Solution:
1. NorthernItaly8k.mkv is 7968x3984, need set
   blkmod 64x32(mem_map_mode 2) for 64 aligned;
2. a special 8192x4608 bitstream which tile_x
   less than 15 need work around;
3. make avs2 mem consume fit with resolution and
   fixed crash when max resolution with 10bit.
   ucode gerrit id: 57342

Verify:
verify on x301.

Change-Id: I9da01e691e96d93bc6a120ed2fde0aa6dac52021
Signed-off-by: shihong.zheng <shihong.zheng@amlogic.com>
This commit is contained in:
shihong.zheng
2018-12-01 16:45:45 +08:00
committed by Dongjin Kim
parent 255c70cc9d
commit 0879ec59c1
4 changed files with 57 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -326,20 +326,6 @@ static const char * const video_format_names[] = {
"MAC", "unspecified", "Reserved", "Reserved"
};
#define PROB_SIZE (496 * 2 * 4)
#define PROB_BUF_SIZE (0x5000)
#define COUNT_BUF_SIZE (0x300 * 4 * 4)
/*compute_losless_comp_body_size(4096, 2304, 1) = 18874368(0x1200000)*/
#define MAX_FRAME_4K_NUM 0x1200
#define MAX_FRAME_8K_NUM 0x4800
//#define FRAME_MMU_MAP_SIZE (MAX_FRAME_4K_NUM * 4)
static int get_frame_mmu_map_size(void)
{
if (get_cpu_major_id() >= AM_MESON_CPU_MAJOR_ID_TL1)
return (MAX_FRAME_8K_NUM * 4);
return (MAX_FRAME_4K_NUM * 4);
}
static inline int div_r32(int64_t m, int n)
{
/*
@@ -802,12 +788,31 @@ static int avs2_print_cont(struct AVS2Decoder_s *dec,
return 0;
}
static int get_compress_header_size(void)
#define PROB_SIZE (496 * 2 * 4)
#define PROB_BUF_SIZE (0x5000)
#define COUNT_BUF_SIZE (0x300 * 4 * 4)
/*compute_losless_comp_body_size(4096, 2304, 1) = 18874368(0x1200000)*/
#define MAX_FRAME_4K_NUM 0x1200
#define MAX_FRAME_8K_NUM 0x4800
#define MAX_SIZE_4K (4096 * 2304)
#define IS_8K_SIZE(w, h) (((w) * (h)) > MAX_SIZE_4K)
static int get_frame_mmu_map_size(struct AVS2Decoder_s *dec)
{
if (get_cpu_major_id() >= AM_MESON_CPU_MAJOR_ID_TL1)
if ((get_cpu_major_id() >= AM_MESON_CPU_MAJOR_ID_TL1) &&
(IS_8K_SIZE(dec->init_pic_w, dec->init_pic_h)))
return (MAX_FRAME_8K_NUM * 4);
return (MAX_FRAME_4K_NUM * 4);
}
static int get_compress_header_size(struct AVS2Decoder_s *dec)
{
if ((get_cpu_major_id() >= AM_MESON_CPU_MAJOR_ID_TL1) &&
(IS_8K_SIZE(dec->init_pic_w, dec->init_pic_h)))
return MMU_COMPRESS_8K_HEADER_SIZE;
return MMU_COMPRESS_HEADER_SIZE;
}
static void reset_process_time(struct AVS2Decoder_s *dec)
{
if (dec->start_process_time) {
@@ -1580,10 +1585,12 @@ static struct BuffInfo_s amvavs2_workbuff_spec[WORK_BUF_SPEC_NUM] = {
.mmu_vbh = {
.buf_size = 0x5000 * 2, /*2*16*2304/4, 4K*/
},
#if 0
.cm_header = {
/*0x44000 = ((1088*2*1024*4)/32/4)*(32/8)*/
.buf_size = MMU_COMPRESS_8K_HEADER_SIZE * 17,
},
#endif
#endif
.mpred_above = {
.buf_size = 0x8000 * 2,
@@ -1591,7 +1598,7 @@ static struct BuffInfo_s amvavs2_workbuff_spec[WORK_BUF_SPEC_NUM] = {
#ifdef MV_USE_FIXED_BUF
.mpred_mv = {
/*4k2k , 0x100000 per buffer*/
.buf_size = 0x100000 * 16 * 4,
.buf_size = 0x120000 * FRAME_BUFFERS * 4,
},
#endif
.rpm = {
@@ -2148,7 +2155,7 @@ static void init_pic_list(struct AVS2Decoder_s *dec,
/*alloc AVS2 compress header first*/
if (decoder_bmmu_box_alloc_buf_phy
(dec->bmmu_box,
HEADER_BUFFER_IDX(-1), get_compress_header_size(),
HEADER_BUFFER_IDX(-1), get_compress_header_size(dec),
DRIVER_HEADER_NAME,
&buf_addr1) < 0){
avs2_print(dec, 0,
@@ -2162,7 +2169,7 @@ static void init_pic_list(struct AVS2Decoder_s *dec,
unsigned long buf_addr;
if (decoder_bmmu_box_alloc_buf_phy
(dec->bmmu_box,
HEADER_BUFFER_IDX(i), get_compress_header_size(),
HEADER_BUFFER_IDX(i), get_compress_header_size(dec),
DRIVER_HEADER_NAME,
&buf_addr) < 0){
avs2_print(dec, 0,
@@ -2455,7 +2462,7 @@ static int config_mc_buffer(struct AVS2Decoder_s *dec)
}
return 0;
}
#if 0
static void mcrcc_get_hitrate(void)
{
u32 tmp;
@@ -2554,8 +2561,9 @@ static void decomp_get_hitrate(void)
}
if (raw_mcr_cnt != 0) {
hitrate = (hit_mcr_cnt / raw_mcr_cnt) * 100;
pr_info("DECOMP_DCACHE_HIT_RATE : %d\n", hitrate);
} else {
if (debug & AVS2_DBG_CACHE)
pr_info("DECOMP_DCACHE_HIT_RATE : %d\n", hitrate);
} else if (debug & AVS2_DBG_CACHE) {
pr_info("DECOMP_DCACHE_HIT_RATE : na\n");
}
return;
@@ -2587,12 +2595,12 @@ static void decomp_get_comprate(void)
/ raw_ucomp_cnt) * 100;
if (debug & AVS2_DBG_CACHE)
pr_info("DECOMP_COMP_RATIO : %d\n", comprate);
} else {
if (debug & AVS2_DBG_CACHE)
} else if (debug & AVS2_DBG_CACHE) {
pr_info("DECOMP_COMP_RATIO : na\n");
}
return;
}
#endif
static void config_mcrcc_axi_hw(struct AVS2Decoder_s *dec)
{
@@ -2607,13 +2615,13 @@ static void config_mcrcc_axi_hw(struct AVS2Decoder_s *dec)
WRITE_VREG(HEVCD_MCRCC_CTL1, 0x0);
return;
}
/*
if (get_cpu_major_id() >= AM_MESON_CPU_MAJOR_ID_TL1) {
mcrcc_get_hitrate();
decomp_get_hitrate();
decomp_get_comprate();
}
*/
if ((avs2_dec->img.type == B_IMG) ||
(avs2_dec->img.type == F_IMG)) { /*B-PIC or F_PIC*/
/*Programme canvas0 */
@@ -3679,7 +3687,7 @@ static void avs2_local_uninit(struct AVS2Decoder_s *dec)
if (dec->frame_mmu_map_addr) {
if (dec->frame_mmu_map_phy_addr)
dma_free_coherent(amports_get_dma_device(),
get_frame_mmu_map_size(), dec->frame_mmu_map_addr,
get_frame_mmu_map_size(dec), dec->frame_mmu_map_addr,
dec->frame_mmu_map_phy_addr);
dec->frame_mmu_map_addr = NULL;
}
@@ -3738,11 +3746,9 @@ static int avs2_local_init(struct AVS2Decoder_s *dec)
&& (buf_alloc_width > 1920 && buf_alloc_height > 1088)) {
buf_alloc_width = 1920;
buf_alloc_height = 1088;
} else {
if (get_cpu_major_id() >= AM_MESON_CPU_MAJOR_ID_TL1) {
buf_alloc_width = 8192;
buf_alloc_height = 4608;
}
} else if (get_cpu_major_id() >= AM_MESON_CPU_MAJOR_ID_TL1) {
buf_alloc_width = 8192;
buf_alloc_height = 4608;
}
dec->init_pic_w = buf_alloc_width ? buf_alloc_width :
(dec->vavs2_amstream_dec_info.width ?
@@ -3823,13 +3829,13 @@ static int avs2_local_init(struct AVS2Decoder_s *dec)
#ifdef AVS2_10B_MMU
dec->frame_mmu_map_addr = dma_alloc_coherent(amports_get_dma_device(),
get_frame_mmu_map_size(),
get_frame_mmu_map_size(dec),
&dec->frame_mmu_map_phy_addr, GFP_KERNEL);
if (dec->frame_mmu_map_addr == NULL) {
pr_err("%s: failed to alloc count_buffer\n", __func__);
return -1;
}
memset(dec->frame_mmu_map_addr, 0, COUNT_BUF_SIZE);
memset(dec->frame_mmu_map_addr, 0, get_frame_mmu_map_size(dec));
/* dec->frame_mmu_map_phy_addr = dma_map_single(amports_get_dma_device(),
dec->frame_mmu_map_addr, FRAME_MMU_MAP_SIZE, DMA_BIDIRECTIONAL);
if (dma_mapping_error(amports_get_dma_device(),

1
drivers/amlogic/media_modules/frame_provider/decoder/utils/decoder_mmu_box.c
View File

@@ -152,7 +152,6 @@ int decoder_mmu_box_alloc_idx(
for (i = 0; i < num_pages; i++)
mmu_index_adr[i] = PAGE_INDEX(sc->pages_list[i]);
mmu_index_adr[num_pages] = 0;
mutex_unlock(&box->mutex);

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

@@ -304,12 +304,6 @@ struct MVBUF_s {
/*#define ENABLE_SWAP_TEST*/
#define MCRCC_ENABLE
#ifdef VP9_10B_NV21
#define MEM_MAP_MODE 2 /* 0:linear 1:32x32 2:64x32*/
#else
#define MEM_MAP_MODE 0 /* 0:linear 1:32x32 2:64x32*/
#endif
#define VP9_LPF_LVL_UPDATE
/*#define DBG_LF_PRINT*/
@@ -2668,8 +2662,11 @@ union param_u vp9_param;
#define LOSLESS_COMPRESS_MODE
/*#define DECOMP_HEADR_SURGENT*/
#ifdef VP9_10B_NV21
static u32 mem_map_mode = 2 /* 0:linear 1:32x32 2:64x32*/
#else
static u32 mem_map_mode; /* 0:linear 1:32x32 2:64x32 ; m8baby test1902 */
#endif
static u32 enable_mem_saving = 1;
static u32 force_w_h;
@@ -5059,7 +5056,7 @@ static void config_sao_hw(struct VP9Decoder_s *pbi, union param_u *params)
data32 = READ_VREG(HEVC_SAO_CTRL1);
data32 &= (~0x3000);
/*[13:12] axi_aformat, 0-Linear, 1-32x32, 2-64x32*/
data32 |= (MEM_MAP_MODE << 12);
data32 |= (mem_map_mode << 12);
data32 &= (~0x3);
data32 |= 0x1; /* [1]:dw_disable [0]:cm_disable*/
WRITE_VREG(HEVC_SAO_CTRL1, data32);
@@ -5073,14 +5070,14 @@ static void config_sao_hw(struct VP9Decoder_s *pbi, union param_u *params)
data32 = READ_VREG(HEVCD_IPP_AXIIF_CONFIG);
data32 &= (~0x30);
/*[5:4] address_format 00:linear 01:32x32 10:64x32*/
data32 |= (MEM_MAP_MODE << 4);
data32 |= (mem_map_mode << 4);
WRITE_VREG(HEVCD_IPP_AXIIF_CONFIG, data32);
#else
/*m8baby test1902*/
data32 = READ_VREG(HEVC_SAO_CTRL1);
data32 &= (~0x3000);
/*[13:12] axi_aformat, 0-Linear, 1-32x32, 2-64x32*/
data32 |= (MEM_MAP_MODE << 12);
data32 |= (mem_map_mode << 12);
data32 &= (~0xff0);
/*data32 |= 0x670;*/ /*Big-Endian per 64-bit*/
data32 |= 0x880; /*.Big-Endian per 64-bit */
@@ -5098,7 +5095,7 @@ static void config_sao_hw(struct VP9Decoder_s *pbi, union param_u *params)
data32 = READ_VREG(HEVCD_IPP_AXIIF_CONFIG);
data32 &= (~0x30);
/*[5:4] address_format 00:linear 01:32x32 10:64x32*/
data32 |= (MEM_MAP_MODE << 4);
data32 |= (mem_map_mode << 4);
data32 &= (~0xF);
data32 |= 0x8; /*Big-Endian per 64-bit*/
WRITE_VREG(HEVCD_IPP_AXIIF_CONFIG, data32);
@@ -5106,7 +5103,7 @@ static void config_sao_hw(struct VP9Decoder_s *pbi, union param_u *params)
#else
data32 = READ_VREG(HEVC_SAO_CTRL1);
data32 &= (~0x3000);
data32 |= (MEM_MAP_MODE <<
data32 |= (mem_map_mode <<
12);
/* [13:12] axi_aformat, 0-Linear,
@@ -6111,7 +6108,7 @@ static int vp9_local_init(struct VP9Decoder_s *pbi)
if (vdec_is_support_4k()) {
if (get_cpu_major_id() >= AM_MESON_CPU_MAJOR_ID_TL1) {
memcpy(cur_buf_info, &amvvp9_workbuff_spec[2], /* 4k */
memcpy(cur_buf_info, &amvvp9_workbuff_spec[2], /* 8k */
sizeof(struct BuffInfo_s));
} else
memcpy(cur_buf_info, &amvvp9_workbuff_spec[1], /* 4k */
@@ -6161,6 +6158,13 @@ static int vp9_local_init(struct VP9Decoder_s *pbi)
(pbi->vvp9_amstream_dec_info.height ?
pbi->vvp9_amstream_dec_info.height :
pbi->work_space_buf->max_height));
if ((get_cpu_major_id() >= AM_MESON_CPU_MAJOR_ID_TL1) &&
(pbi->double_write_mode != 0) &&
(((pbi->max_pic_w % 64) != 0) ||
(pbi->vvp9_amstream_dec_info.width % 64) != 0))
mem_map_mode = 2;
#ifndef MV_USE_FIXED_BUF
if (init_mv_buf_list(pbi) < 0) {
pr_err("%s: init_mv_buf_list fail\n", __func__);

BIN
firmware/video/video_ucode.bin
View File

Binary file not shown.