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

video: rockchip: vpu: soft reset only in chip rk3399 rk3328 rk3229

Browse Source 
Fixes: d96ea9d580 ("video: rockchip: vpu: add soft reset for rkvdec")
Change-Id: I852309fbf9ee30a2a1dde8364b3535927e3b47e5
Signed-off-by: Rimon Xu <rimon.xu@rock-chips.com>
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
This commit is contained in:
Rimon Xu
2018-10-23 11:54:52 +08:00
committed by Tao Huang
parent 774e76fa41
commit f387fa8ab2
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/video/rockchip/vcodec/vcodec_service.c
View File

@@ -364,6 +364,7 @@ struct vpu_service_info {
bool auto_freq;
bool bug_dec_addr;
bool soft_reset;
atomic_t freq_status;
bool secure_isr;
@@ -3721,6 +3722,16 @@ static void get_hw_info(struct vpu_subdev_data *data)
} else {
dec->max_dec_pic_width = 4096;
}
/* in 3399 3228 and 3229 chips, avoid vpu timeout
* and can't recover problem
*/
if (of_machine_is_compatible("rockchip,rk3399") ||
of_machine_is_compatible("rockchip,rk3228") ||
of_machine_is_compatible("rockchip,rk3229"))
pservice->soft_reset = true;
else
pservice->soft_reset = false;
}
static bool check_irq_err(struct vpu_task_info *task, u32 irq_status)
@@ -3838,8 +3849,8 @@ static irqreturn_t vdpu_isr(int irq, void *dev_id)
clear_bit(MMU_PAGEFAULT, &data->state);
}
reg_from_run_to_done(data, pservice->reg_codec);
/* avoid vpu timeout and can't recover problem */
vpu_soft_reset(data);
if (pservice->soft_reset)
vpu_soft_reset(data);
}
}