aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/rs780_dpm.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/radeon/rs780_dpm.c')
-rw-r--r--drivers/gpu/drm/radeon/rs780_dpm.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/radeon/rs780_dpm.c b/drivers/gpu/drm/radeon/rs780_dpm.c
index 8512085b0aef..02f7710de470 100644
--- a/drivers/gpu/drm/radeon/rs780_dpm.c
+++ b/drivers/gpu/drm/radeon/rs780_dpm.c
@@ -807,9 +807,6 @@ static int rs780_parse_power_table(struct radeon_device *rdev)
807 power_info->pplib.ucNumStates, GFP_KERNEL); 807 power_info->pplib.ucNumStates, GFP_KERNEL);
808 if (!rdev->pm.dpm.ps) 808 if (!rdev->pm.dpm.ps)
809 return -ENOMEM; 809 return -ENOMEM;
810 rdev->pm.dpm.platform_caps = le32_to_cpu(power_info->pplib.ulPlatformCaps);
811 rdev->pm.dpm.backbias_response_time = le16_to_cpu(power_info->pplib.usBackbiasTime);
812 rdev->pm.dpm.voltage_response_time = le16_to_cpu(power_info->pplib.usVoltageTime);
813 810
814 for (i = 0; i < power_info->pplib.ucNumStates; i++) { 811 for (i = 0; i < power_info->pplib.ucNumStates; i++) {
815 power_state = (union pplib_power_state *) 812 power_state = (union pplib_power_state *)
@@ -859,6 +856,10 @@ int rs780_dpm_init(struct radeon_device *rdev)
859 return -ENOMEM; 856 return -ENOMEM;
860 rdev->pm.dpm.priv = pi; 857 rdev->pm.dpm.priv = pi;
861 858
859 ret = r600_get_platform_caps(rdev);
860 if (ret)
861 return ret;
862
862 ret = rs780_parse_power_table(rdev); 863 ret = rs780_parse_power_table(rdev);
863 if (ret) 864 if (ret)
864 return ret; 865 return ret;