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: rk3562 use mmu reset & cru reset

Browse Source 
Fixes: e111685605 ("video: rockchip: mpp: rk3562 use cru reset")

Change-Id: Ie899f86c3cbbdf71bda5af087305af132d27cead
Signed-off-by: Chandler Chen <chandler.chen@rock-chips.com>
This commit is contained in:
Chandler Chen
2024-10-11 10:17:43 +08:00
parent 358f888f72
commit 696a80bb09
1 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1361,6 +1361,24 @@ static int rkvdec2_vdpu382_reset(struct mpp_dev *mpp)
}
static int rkvdec2_rk3562_reset(struct mpp_dev *mpp)
{
int ret = 0;
/*
* only for rk3562
* use mmu reset and cru reset
* rkvdec will reset together when rkvdec_mmu force reset
*/
ret = rockchip_iommu_force_reset(mpp->dev);
mpp_write(mpp, RKVDEC_REG_INT_EN, 0);
if (ret)
mpp_err("soft mmu reset fail, ret %d\n", ret);
return rkvdec2_reset(mpp);
}
static int rkvdec2_sip_reset(struct mpp_dev *mpp)
{
mpp_debug_enter();
@@ -1387,7 +1405,7 @@ int rkvdec2_reset(struct mpp_dev *mpp)
/* cru reset */
if (dec->rst_a && dec->rst_h) {
mpp_err("cru reset\n");
mpp_debug(DEBUG_RESET, "cru reset in\n");
mpp_pmu_idle_request(mpp, true);
mpp_safe_reset(dec->rst_niu_a);
mpp_safe_reset(dec->rst_niu_h);
@@ -1405,6 +1423,7 @@ int rkvdec2_reset(struct mpp_dev *mpp)
mpp_safe_unreset(dec->rst_cabac);
mpp_safe_unreset(dec->rst_hevc_cabac);
mpp_pmu_idle_request(mpp, false);
mpp_debug(DEBUG_RESET, "cru reset out\n");
}
mpp_debug_leave();
@@ -1482,6 +1501,15 @@ static struct mpp_hw_ops rkvdec_vdpu382_hw_ops = {
.reset = rkvdec2_vdpu382_reset,
};
static struct mpp_hw_ops rkvdec_rk3562_hw_ops = {
.init = rkvdec2_init,
.clk_on = rkvdec2_clk_on,
.clk_off = rkvdec2_clk_off,
.get_freq = rkvdec2_get_freq,
.set_freq = rkvdec2_set_freq,
.reset = rkvdec2_rk3562_reset,
};
static struct mpp_hw_ops rkvdec_rk3576_hw_ops = {
.init = rkvdec2_rk3576_init,
.exit = rkvdec2_rk3576_exit,
@@ -1562,7 +1590,7 @@ static const struct mpp_dev_var rkvdec_rk3562_data = {
.device_type = MPP_DEVICE_RKVDEC,
.hw_info = &rkvdec_vdpu382_hw_info,
.trans_info = rkvdec_v2_trans,
.hw_ops = &rkvdec_v2_hw_ops,
.hw_ops = &rkvdec_rk3562_hw_ops,
.dev_ops = &rkvdec_v2_dev_ops,
};