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

video: rockchip: mpp: rkvdec2: Use new API to init and uinit opp table

Browse Source 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I013ed72ef9fb1a3e93453cb73a421a00709bd35c
This commit is contained in:
Finley Xiao
2023-06-09 10:51:00 +08:00
committed by Tao Huang
parent 148a53e168
commit 400ce7d433
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -822,6 +822,7 @@ static int rkvdec2_devfreq_init(struct mpp_dev *mpp)
{
struct rkvdec2_dev *dec = to_rkvdec2_dev(mpp);
struct clk *clk_core = dec->core_clk_info.clk;
struct rockchip_opp_info *opp_info = &dec->opp_info;
int ret = 0;
if (!clk_core)
@@ -839,7 +840,7 @@ static int rkvdec2_devfreq_init(struct mpp_dev *mpp)
return 0;
}
ret = rockchip_init_opp_table(mpp->dev, NULL, "leakage", "vdec");
ret = rockchip_init_opp_table(mpp->dev, opp_info, NULL, "vdec");
if (ret) {
dev_err(mpp->dev, "failed to init_opp_table\n");
return ret;
@@ -867,6 +868,7 @@ static int rkvdec2_devfreq_init(struct mpp_dev *mpp)
devfreq_register_opp_notifier(mpp->dev, dec->devfreq);
vdec2_mdevp.data = dec->devfreq;
vdec2_mdevp.opp_info = opp_info;
dec->mdev_info = rockchip_system_monitor_register(mpp->dev, &vdec2_mdevp);
if (IS_ERR(dec->mdev_info)) {
dev_dbg(mpp->dev, "without system monitor\n");
@@ -889,11 +891,10 @@ static int rkvdec2_devfreq_remove(struct mpp_dev *mpp)
if (dec->mdev_info)
rockchip_system_monitor_unregister(dec->mdev_info);
if (dec->devfreq) {
if (dec->devfreq)
devfreq_unregister_opp_notifier(mpp->dev, dec->devfreq);
dev_pm_opp_of_remove_table(mpp->dev);
devfreq_remove_governor(&devfreq_vdec2_ondemand);
}
devfreq_remove_governor(&devfreq_vdec2_ondemand);
rockchip_uninit_opp_table(mpp->dev, &dec->opp_info);
return 0;
}

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

@@ -24,6 +24,7 @@
#include <linux/regulator/consumer.h>
#include <soc/rockchip/pm_domains.h>
#include <soc/rockchip/rockchip_opp_select.h>
#include <soc/rockchip/rockchip_sip.h>
#include "mpp_debug.h"
@@ -196,6 +197,7 @@ struct rkvdec2_dev {
unsigned long core_rate_hz;
unsigned long core_last_rate_hz;
struct monitor_dev_info *mdev_info;
struct rockchip_opp_info opp_info;
#endif
/* internal rcb-memory */