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

video: rockchip: mpp: fix dule-core synergy stuck issue

Browse Source 
There is a issue of stuck during dual-core collabration,
and the hw timeout count will be blocked by default,
and only soft timeout can be triggered to exit.

However, the soft timeout is too loog, so config reg to not mask the hw
timeout.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: If801b8ba3b463094ea497fae829f772de7ade382
This commit is contained in:
Yandong Lin
2023-04-28 10:37:03 +08:00
committed by Tao Huang
parent 8cc161a8e1
commit 49bf5942cf
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/video/rockchip/mpp/mpp_rkvdec2_link.c
View File

@@ -1301,6 +1301,25 @@ void rkvdec2_link_session_deinit(struct mpp_session *session)
mpp_debug_leave();
}
#define RKVDEC2_1080P_PIXELS (1920*1080)
#define RKVDEC2_4K_PIXELS (4096*2304)
#define RKVDEC2_8K_PIXELS (7680*4320)
#define RKVDEC2_CCU_TIMEOUT_20MS (0xefffff)
#define RKVDEC2_CCU_TIMEOUT_50MS (0x2cfffff)
#define RKVDEC2_CCU_TIMEOUT_100MS (0x4ffffff)
static u32 rkvdec2_ccu_get_timeout_threshold(struct rkvdec2_task *task)
{
u32 pixels = task->pixels;
if (pixels < RKVDEC2_1080P_PIXELS)
return RKVDEC2_CCU_TIMEOUT_20MS;
else if (pixels < RKVDEC2_4K_PIXELS)
return RKVDEC2_CCU_TIMEOUT_50MS;
else
return RKVDEC2_CCU_TIMEOUT_100MS;
}
int rkvdec2_attach_ccu(struct device *dev, struct rkvdec2_dev *dec)
{
int ret;
@@ -1732,6 +1751,9 @@ static int rkvdec2_soft_ccu_enqueue(struct mpp_dev *mpp, struct mpp_task *mpp_ta
mpp_write_relaxed(mpp, RKVDEC_REG_CLR_CACHE2_BASE, 1);
mpp_iommu_flush_tlb(mpp->iommu_info);
/* disable multicore pu/colmv offset req timeout reset */
task->reg[RKVDEC_REG_EN_MODE_SET] |= BIT(1);
task->reg[RKVDEC_REG_TIMEOUT_THRESHOLD] = rkvdec2_ccu_get_timeout_threshold(task);
/* set registers for hardware */
reg_en = mpp_task->hw_info->reg_en;
for (i = 0; i < task->w_req_cnt; i++) {
@@ -2175,25 +2197,6 @@ static int rkvdec2_hard_ccu_reset(struct mpp_taskqueue *queue, struct rkvdec2_cc
return 0;
}
#define RKVDEC2_1080P_PIXELS (1920*1080)
#define RKVDEC2_4K_PIXELS (4096*2304)
#define RKVDEC2_8K_PIXELS (7680*4320)
#define RKVDEC2_TIMEOUT_20MS (0xefffff)
#define RKVDEC2_TIMEOUT_50MS (0x2cfffff)
#define RKVDEC2_TIMEOUT_100MS (0x4ffffff)
static u32 rkvdec2_get_timeout_threshold(struct rkvdec2_task *task)
{
u32 pixels = task->pixels;
if (pixels < RKVDEC2_1080P_PIXELS)
return RKVDEC2_TIMEOUT_20MS;
else if (pixels < RKVDEC2_4K_PIXELS)
return RKVDEC2_TIMEOUT_50MS;
else
return RKVDEC2_TIMEOUT_100MS;
}
static struct mpp_task *
rkvdec2_hard_ccu_prepare(struct mpp_task *mpp_task,
struct rkvdec2_ccu *ccu, struct rkvdec_link_info *hw)
@@ -2235,7 +2238,7 @@ rkvdec2_hard_ccu_prepare(struct mpp_task *mpp_task,
/* disable multicore pu/colmv offset req timeout reset */
task->reg[RKVDEC_REG_EN_MODE_SET] |= BIT(1);
task->reg[RKVDEC_REG_TIMEOUT_THRESHOLD] = rkvdec2_get_timeout_threshold(task);
task->reg[RKVDEC_REG_TIMEOUT_THRESHOLD] = rkvdec2_ccu_get_timeout_threshold(task);
for (i = 0; i < hw->part_w_num; i++) {
off = part[i].tb_reg_off;