diff options
author | Alex Deucher <alexander.deucher@amd.com> | 2014-10-13 15:34:13 (GMT) |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2014-10-13 15:34:13 (GMT) |
commit | 60779143b5451095b4bbfb021d39955cb4794913 (patch) | |
tree | a63b4c63ff34135355e0d83c85eee4e1022bc4a4 /drivers/gpu | |
parent | dfda0df3426483cf5fc7441f23f318edbabecb03 (diff) | |
download | linux-60779143b5451095b4bbfb021d39955cb4794913.tar.xz |
Revert "drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table"
This reverts commit fc9dfeb1383287631ad5c5a676a2558b799db6e9.
There are still some stability problems on some SI boards so bring
this back.
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/drm/radeon/btc_dpm.c | 17 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/btc_dpm.h | 2 |
2 files changed, 19 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/btc_dpm.c b/drivers/gpu/drm/radeon/btc_dpm.c index 300d971..b718160 100644 --- a/drivers/gpu/drm/radeon/btc_dpm.c +++ b/drivers/gpu/drm/radeon/btc_dpm.c @@ -1170,6 +1170,23 @@ static const struct radeon_blacklist_clocks btc_blacklist_clocks[] = { 25000, 30000, RADEON_SCLK_UP } }; +void btc_get_max_clock_from_voltage_dependency_table(struct radeon_clock_voltage_dependency_table *table, + u32 *max_clock) +{ + u32 i, clock = 0; + + if ((table == NULL) || (table->count == 0)) { + *max_clock = clock; + return; + } + + for (i = 0; i < table->count; i++) { + if (clock < table->entries[i].clk) + clock = table->entries[i].clk; + } + *max_clock = clock; +} + void btc_apply_voltage_dependency_rules(struct radeon_clock_voltage_dependency_table *table, u32 clock, u16 max_voltage, u16 *voltage) { diff --git a/drivers/gpu/drm/radeon/btc_dpm.h b/drivers/gpu/drm/radeon/btc_dpm.h index 1a15e0e..3b6f12b 100644 --- a/drivers/gpu/drm/radeon/btc_dpm.h +++ b/drivers/gpu/drm/radeon/btc_dpm.h @@ -46,6 +46,8 @@ void btc_adjust_clock_combinations(struct radeon_device *rdev, struct rv7xx_pl *pl); void btc_apply_voltage_dependency_rules(struct radeon_clock_voltage_dependency_table *table, u32 clock, u16 max_voltage, u16 *voltage); +void btc_get_max_clock_from_voltage_dependency_table(struct radeon_clock_voltage_dependency_table *table, + u32 *max_clock); void btc_apply_voltage_delta_rules(struct radeon_device *rdev, u16 max_vddc, u16 max_vddci, u16 *vddc, u16 *vddci); |