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

video: rockchip: mpp: add vdpu383 int_err_mask

Browse Source 
Change-Id: Ie9b112f55427b20242148021baf55c054a0f53e5
Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
This commit is contained in:
Chandler Chen
2024-05-07 09:27:31 +08:00
committed by Tao Huang
parent efba86d983
commit 38e425f2a3
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/video/rockchip/mpp/mpp_rkvdec2.c
View File

@@ -588,6 +588,7 @@ static int rkvdec2_isr(struct mpp_dev *mpp)
struct rkvdec2_task *task = NULL;
struct mpp_task *mpp_task = mpp->cur_task;
struct rkvdec2_dev *dec = to_rkvdec2_dev(mpp);
struct rkvdec_link_info *link_info = mpp->var->hw_info->link_info;
/* FIXME use a spin lock here */
if (!mpp_task) {
@@ -601,8 +602,7 @@ static int rkvdec2_isr(struct mpp_dev *mpp)
task->irq_status = mpp->irq_status;
mpp_debug(DEBUG_IRQ_STATUS, "irq_status: %08x\n", task->irq_status);
err_mask = RKVDEC_COLMV_REF_ERR_STA | RKVDEC_BUF_EMPTY_STA |
RKVDEC_TIMEOUT_STA | RKVDEC_ERROR_STA;
err_mask = link_info->err_mask;
if (err_mask & task->irq_status) {
atomic_inc(&mpp->reset_request);
if (mpp_debug_unlikely(DEBUG_DUMP_ERR_REG)) {

4
drivers/video/rockchip/mpp/mpp_rkvdec2.h
View File

@@ -67,10 +67,6 @@
#define RKVDEC_READY_STA BIT(2)
#define RKVDEC_IRQ_RAW BIT(1)
#define RKVDEC_IRQ BIT(0)
#define RKVDEC_INT_ERROR_MASK (RKVDEC_COLMV_REF_ERR_STA |\
RKVDEC_BUF_EMPTY_STA |\
RKVDEC_TIMEOUT_STA |\
RKVDEC_ERROR_STA)
#define RKVDEC_PERF_WORKING_CNT 0x41c
/* perf sel reference register */

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

@@ -79,6 +79,7 @@ struct rkvdec_link_info rkvdec_link_v2_hw_info = {
},
.irq_base = 0x00,
.next_addr_base = 0x1c,
.err_mask = 0xf0,
};
/* vdpu34x link hw info for rk356x */
@@ -140,6 +141,7 @@ struct rkvdec_link_info rkvdec_link_rk356x_hw_info = {
},
.irq_base = 0x00,
.next_addr_base = 0x1c,
.err_mask = 0xf0,
};
/* vdpu382 link hw info */
@@ -201,6 +203,7 @@ struct rkvdec_link_info rkvdec_link_vdpu382_hw_info = {
},
.irq_base = 0x00,
.next_addr_base = 0x1c,
.err_mask = 0xf0,
};
/* vdpu383 link hw info */
@@ -1102,7 +1105,7 @@ static void rkvdec2_link_try_dequeue(struct mpp_dev *mpp)
mpp_task->session->index, mpp_task->task_index,
irq_status, timeout_flag, abort_flag);
if (irq_status & RKVDEC_INT_ERROR_MASK) {
if (irq_status & info->err_mask) {
dev_err(mpp->dev,
"session %d task %d irq_status %#08x timeout %u abort %u\n",
mpp_task->session->index, mpp_task->task_index,
@@ -1851,10 +1854,11 @@ irqreturn_t rkvdec2_soft_ccu_irq(int irq, void *param)
{
struct mpp_dev *mpp = param;
u32 irq_status = mpp_read_relaxed(mpp, RKVDEC_REG_INT_EN);
struct rkvdec_link_info *link_info = mpp->var->hw_info->link_info;
if (irq_status & RKVDEC_IRQ_RAW) {
mpp_debug(DEBUG_IRQ_STATUS, "irq_status=%08x\n", irq_status);
if (irq_status & RKVDEC_INT_ERROR_MASK) {
if (irq_status & link_info->err_mask) {
atomic_inc(&mpp->reset_request);
atomic_inc(&mpp->queue->reset_request);
}
@@ -2214,7 +2218,7 @@ static int rkvdec2_hard_ccu_dequeue(struct mpp_taskqueue *queue,
mpp_debug(DEBUG_IRQ_CHECK,
"session %d task %d w:h[%d %d] err %d irq_status %#x timeout=%u abort=%u iova %08x next %08x ccu[%d %d]\n",
mpp_task->session->index, mpp_task->task_index, task->width,
task->height, !!(irq_status & RKVDEC_INT_ERROR_MASK), irq_status,
task->height, !!(irq_status & hw->err_mask), irq_status,
timeout_flag, abort_flag, (u32)task->table->iova,
((u32 *)task->table->vaddr)[hw->tb_reg_next],
ccu_decoded_num, ccu_total_dec_num);
@@ -2251,7 +2255,7 @@ static int rkvdec2_hard_ccu_dequeue(struct mpp_taskqueue *queue,
list_del_init(&mpp_task->queue_link);
/* Wake up the GET thread */
wake_up(&mpp_task->wait);
if ((irq_status & RKVDEC_INT_ERROR_MASK) || timeout_flag) {
if ((irq_status & hw->err_mask) || timeout_flag) {
pr_err("session %d task %d irq_status %#x timeout=%u abort=%u\n",
mpp_task->session->index, mpp_task->task_index,
irq_status, timeout_flag, abort_flag);