evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/radeon/dpm/rs780: properly catch errors in dpm setup

Browse source 
We weren't properly catching errors in dpm_enable()
and dpm_set_power_state().

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Alex Deucher 2013-03-26 19:23:19 -04:00
parent ac0cdcb514
commit a172230f19
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/gpu/drm/radeon/rs780_dpm.c
View file

@ -546,14 +546,16 @@ int rs780_dpm_enable(struct radeon_device *rdev)
{ {
struct igp_power_info *pi = rs780_get_pi(rdev); struct igp_power_info *pi = rs780_get_pi(rdev);
struct radeon_ps *boot_ps = rdev->pm.dpm.boot_ps; struct radeon_ps *boot_ps = rdev->pm.dpm.boot_ps;
int ret;
rs780_get_pm_mode_parameters(rdev); rs780_get_pm_mode_parameters(rdev);
rs780_disable_vbios_powersaving(rdev); rs780_disable_vbios_powersaving(rdev);
if (r600_dynamicpm_enabled(rdev)) if (r600_dynamicpm_enabled(rdev))
return -EINVAL; return -EINVAL;
if (rs780_initialize_dpm_parameters(rdev, boot_ps)) ret = rs780_initialize_dpm_parameters(rdev, boot_ps);
return -EINVAL; if (ret)
return ret;
rs780_start_dpm(rdev); rs780_start_dpm(rdev);
rs780_preset_ranges_slow_clk_fbdiv_en(rdev); rs780_preset_ranges_slow_clk_fbdiv_en(rdev);
@ -571,7 +573,9 @@ int rs780_dpm_enable(struct radeon_device *rdev)
r600_gfx_clockgating_enable(rdev, true); r600_gfx_clockgating_enable(rdev, true);
if (rdev->irq.installed && (rdev->pm.int_thermal_type == THERMAL_TYPE_RV6XX)) { if (rdev->irq.installed && (rdev->pm.int_thermal_type == THERMAL_TYPE_RV6XX)) {
r600_set_thermal_temperature_range(rdev, R600_TEMP_RANGE_MIN, R600_TEMP_RANGE_MAX); ret = r600_set_thermal_temperature_range(rdev, R600_TEMP_RANGE_MIN, R600_TEMP_RANGE_MAX);
if (ret)
return ret;
rdev->irq.dpm_thermal = true; rdev->irq.dpm_thermal = true;
radeon_irq_set(rdev); radeon_irq_set(rdev);
} }
@ -603,6 +607,7 @@ int rs780_dpm_set_power_state(struct radeon_device *rdev)
struct igp_power_info *pi = rs780_get_pi(rdev); struct igp_power_info *pi = rs780_get_pi(rdev);
struct radeon_ps *new_ps = rdev->pm.dpm.requested_ps; struct radeon_ps *new_ps = rdev->pm.dpm.requested_ps;
struct radeon_ps *old_ps = rdev->pm.dpm.current_ps; struct radeon_ps *old_ps = rdev->pm.dpm.current_ps;
int ret;
rs780_get_pm_mode_parameters(rdev); rs780_get_pm_mode_parameters(rdev);
@ -611,7 +616,9 @@ int rs780_dpm_set_power_state(struct radeon_device *rdev)
mdelay(5); mdelay(5);
} }
rs780_set_engine_clock_scaling(rdev, new_ps, old_ps); ret = rs780_set_engine_clock_scaling(rdev, new_ps, old_ps);
if (ret)
return ret;
rs780_set_engine_clock_spc(rdev, new_ps, old_ps); rs780_set_engine_clock_spc(rdev, new_ps, old_ps);
rs780_activate_engine_clk_scaling(rdev, new_ps, old_ps); rs780_activate_engine_clk_scaling(rdev, new_ps, old_ps);