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

MALI: bifrost: Set intermediate rate before change read margin

Browse Source 
Improve stability when change read margin.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I0ddb1d00c670cbc8e4c64f999382f1420a86c537
This commit is contained in:
Finley Xiao
2022-02-17 12:28:47 +08:00
committed by Tao Huang
parent c00e3a0e83
commit eb26be047e
2 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/gpu/arm/bifrost/backend/gpu/mali_kbase_devfreq.c
View File

@@ -127,19 +127,6 @@ void kbase_devfreq_opp_translate(struct kbase_device *kbdev, unsigned long freq,
} }
} }
static int kbase_devfreq_set_read_margin(struct device *dev,
struct rockchip_opp_info *opp_info,
u32 rm,
bool is_set_rm)
{
if (opp_info->data && opp_info->data->set_read_margin) {
if (is_set_rm)
opp_info->data->set_read_margin(dev, opp_info, rm);
}
return 0;
}
int kbase_devfreq_opp_helper(struct dev_pm_set_opp_data *data) int kbase_devfreq_opp_helper(struct dev_pm_set_opp_data *data)
{ {
struct device *dev = data->dev; struct device *dev = data->dev;
@@ -173,8 +160,12 @@ int kbase_devfreq_opp_helper(struct dev_pm_set_opp_data *data)
rockchip_get_read_margin(dev, opp_info, new_supply_vdd->u_volt, rockchip_get_read_margin(dev, opp_info, new_supply_vdd->u_volt,
&target_rm); &target_rm);
/* Change frequency */
dev_dbg(dev, "switching OPP: %lu Hz --> %lu Hz\n", old_freq, new_freq);
/* Scaling up? Scale voltage before frequency */ /* Scaling up? Scale voltage before frequency */
if (new_freq >= old_freq) { if (new_freq >= old_freq) {
rockchip_set_intermediate_rate(dev, opp_info, clk, old_freq,
new_freq, true, is_set_clk);
ret = regulator_set_voltage(mem_reg, new_supply_mem->u_volt, ret = regulator_set_voltage(mem_reg, new_supply_mem->u_volt,
INT_MAX); INT_MAX);
if (ret) { if (ret) {
@@ -189,21 +180,20 @@ int kbase_devfreq_opp_helper(struct dev_pm_set_opp_data *data)
new_supply_vdd->u_volt); new_supply_vdd->u_volt);
goto restore_voltage; goto restore_voltage;
} }
kbase_devfreq_set_read_margin(dev, opp_info, target_rm, rockchip_set_read_margin(dev, opp_info, target_rm, is_set_rm);
is_set_rm); if (is_set_clk && clk_set_rate(clk, new_freq)) {
} dev_err(dev, "failed to set clk rate: %d\n", ret);
goto restore_rm;
/* Change frequency */ }
dev_dbg(dev, "switching OPP: %lu Hz --> %lu Hz\n", old_freq, new_freq);
if (is_set_clk && clk_set_rate(clk, new_freq)) {
dev_err(dev, "failed to set clk rate: %d\n", ret);
goto restore_rm;
}
/* Scaling down? Scale voltage after frequency */ /* Scaling down? Scale voltage after frequency */
if (new_freq < old_freq) { } else {
kbase_devfreq_set_read_margin(dev, opp_info, target_rm, rockchip_set_intermediate_rate(dev, opp_info, clk, old_freq,
is_set_rm); new_freq, false, is_set_clk);
rockchip_set_read_margin(dev, opp_info, target_rm, is_set_rm);
if (is_set_clk && clk_set_rate(clk, new_freq)) {
dev_err(dev, "failed to set clk rate: %d\n", ret);
goto restore_rm;
}
ret = regulator_set_voltage(vdd_reg, new_supply_vdd->u_volt, ret = regulator_set_voltage(vdd_reg, new_supply_vdd->u_volt,
INT_MAX); INT_MAX);
if (ret) { if (ret) {
@@ -230,7 +220,7 @@ restore_freq:
restore_rm: restore_rm:
rockchip_get_read_margin(dev, opp_info, old_supply_vdd->u_volt, rockchip_get_read_margin(dev, opp_info, old_supply_vdd->u_volt,
&target_rm); &target_rm);
kbase_devfreq_set_read_margin(dev, opp_info, target_rm, is_set_rm); rockchip_set_read_margin(dev, opp_info, opp_info->target_rm, is_set_rm);
restore_voltage: restore_voltage:
regulator_set_voltage(mem_reg, old_supply_mem->u_volt, INT_MAX); regulator_set_voltage(mem_reg, old_supply_mem->u_volt, INT_MAX);
regulator_set_voltage(vdd_reg, old_supply_vdd->u_volt, INT_MAX); regulator_set_voltage(vdd_reg, old_supply_vdd->u_volt, INT_MAX);
@@ -254,6 +244,8 @@ kbase_devfreq_target(struct device *dev, unsigned long *freq, u32 flags)
return PTR_ERR(opp); return PTR_ERR(opp);
dev_pm_opp_put(opp); dev_pm_opp_put(opp);
if (*freq == kbdev->current_nominal_freq)
return 0;
rockchip_monitor_volt_adjust_lock(kbdev->mdev_info); rockchip_monitor_volt_adjust_lock(kbdev->mdev_info);
ret = dev_pm_opp_set_rate(dev, *freq); ret = dev_pm_opp_set_rate(dev, *freq);
if (!ret) { if (!ret) {

6
drivers/gpu/arm/bifrost/platform/rk/mali_kbase_config_rk.c
View File

@@ -202,14 +202,14 @@ static int rk_pm_callback_runtime_on(struct kbase_device *kbdev)
dev_err(kbdev->dev, "failed to enable opp clks\n"); dev_err(kbdev->dev, "failed to enable opp clks\n");
return ret; return ret;
} }
if (opp_info->data && opp_info->data->set_read_margin)
opp_info->data->set_read_margin(kbdev->dev, opp_info,
opp_info->target_rm);
if (opp_info->scmi_clk) { if (opp_info->scmi_clk) {
if (clk_set_rate(opp_info->scmi_clk, if (clk_set_rate(opp_info->scmi_clk,
kbdev->current_nominal_freq)) kbdev->current_nominal_freq))
dev_err(kbdev->dev, "failed to restore clk rate\n"); dev_err(kbdev->dev, "failed to restore clk rate\n");
} }
if (opp_info->data && opp_info->data->set_read_margin)
opp_info->data->set_read_margin(kbdev->dev, opp_info,
opp_info->target_rm);
clk_bulk_disable_unprepare(opp_info->num_clks, opp_info->clks); clk_bulk_disable_unprepare(opp_info->num_clks, opp_info->clks);
return 0; return 0;