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

VPU: return correct decoded length on iommu case

Browse Source 
On iommu case the decode buffer address is replace by iommu address.
When decoding finished the new register value is also the iommu address.
So the actual decoded length need a hack to calculate.

This patch is to resolve H.264 field stream packet with both top field
and bottom field. By retrieving the real decoded length decoder can detect
this case.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2015-06-18 21:54:23 +08:00
parent ad6a4ffb3c
commit 8d63e1b1d9
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
arch/arm/mach-rockchip/vcodec_service.c
View File

@@ -395,6 +395,7 @@ typedef struct vpu_reg {
unsigned long size;
#if defined(CONFIG_VCODEC_MMU)
struct list_head mem_region_list;
u32 dec_base;
#endif
u32 *reg;
} vpu_reg;
@@ -1119,6 +1120,16 @@ static int vcodec_bufid_to_iova(struct vpu_subdev_data *data, u8 *tbl,
ion_free(pservice->ion_client, hdl);
return ret;
}
/* special for vpu dec num 12: record decoded length
hacking for decoded length
NOTE: not a perfect fix, the fd is not recorded */
if (tbl[i] == 12 && data->hw_info->hw_id != HEVC_ID &&
(reg->type == VPU_DEC || reg->type == VPU_DEC_PP)) {
reg->dec_base = mem_region->iova + offset;
vpu_debug(DEBUG_REGISTER, "dec_set %08x\n", reg->dec_base);
}
reg->reg[tbl[i]] = mem_region->iova + offset;
INIT_LIST_HEAD(&mem_region->reg_lnk);
list_add_tail(&mem_region->reg_lnk, &reg->mem_region_list);
@@ -1375,6 +1386,15 @@ static void reg_from_run_to_done(struct vpu_subdev_data *data,
int reg_len = REG_NUM_9190_DEC;
pservice->reg_codec = NULL;
reg_copy_from_hw(reg, data->dec_dev.hwregs, reg_len);
#if defined(CONFIG_VCODEC_MMU)
/* revert hack for decoded length */
if (data->hw_info->hw_id != HEVC_ID) {
u32 dec_get = reg->reg[12];
s32 dec_length = dec_get - reg->dec_base;
vpu_debug(DEBUG_REGISTER, "dec_get %08x dec_length %d\n", dec_get, dec_length);
reg->reg[12] = dec_length << 10;
}
#endif
irq_reg = DEC_INTERRUPT_REGISTER;
break;
}
@@ -1389,6 +1409,15 @@ static void reg_from_run_to_done(struct vpu_subdev_data *data,
pservice->reg_pproc = NULL;
reg_copy_from_hw(reg, data->dec_dev.hwregs, REG_NUM_9190_DEC_PP);
data->dec_dev.hwregs[PP_INTERRUPT_REGISTER] = 0;
#if defined(CONFIG_VCODEC_MMU)
/* revert hack for decoded length */
if (data->hw_info->hw_id != HEVC_ID) {
u32 dec_get = reg->reg[12];
s32 dec_length = dec_get - reg->dec_base;
vpu_debug(DEBUG_REGISTER, "dec_get %08x dec_length %d\n", dec_get, dec_length);
reg->reg[12] = dec_length << 10;
}
#endif
break;
}
default : {