aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/ci_dpm.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2013-12-19 16:17:47 -0500
committerAlex Deucher <alexander.deucher@amd.com>2013-12-24 17:56:50 -0500
commite14cd2bbcb98541e199b7223f38d61527dfe45c9 (patch)
tree21b85dd82b3ef306fb1a92c4131fbc3029f86334 /drivers/gpu/drm/radeon/ci_dpm.c
parentd8852c3446ddeab300c4ae397d658b8715535102 (diff)
drm/radeon/dpm: switch on new late_enable callback
Right now it's called right after enable, but after reworking the dpm init order, it will get called later to accomodate loading the smc early, but enabling thermal interrupts and block powergating later after the ring tests are complete. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/ci_dpm.c')
-rw-r--r--drivers/gpu/drm/radeon/ci_dpm.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/drivers/gpu/drm/radeon/ci_dpm.c b/drivers/gpu/drm/radeon/ci_dpm.c
index 13ee5af3437e..6eab12d1641b 100644
--- a/drivers/gpu/drm/radeon/ci_dpm.c
+++ b/drivers/gpu/drm/radeon/ci_dpm.c
@@ -4656,30 +4656,9 @@ int ci_dpm_enable(struct radeon_device *rdev)
4656 DRM_ERROR("ci_enable_power_containment failed\n"); 4656 DRM_ERROR("ci_enable_power_containment failed\n");
4657 return ret; 4657 return ret;
4658 } 4658 }
4659 if (rdev->irq.installed &&
4660 r600_is_internal_thermal_sensor(rdev->pm.int_thermal_type)) {
4661#if 0
4662 PPSMC_Result result;
4663#endif
4664 ret = ci_set_thermal_temperature_range(rdev, R600_TEMP_RANGE_MIN, R600_TEMP_RANGE_MAX);
4665 if (ret) {
4666 DRM_ERROR("ci_set_thermal_temperature_range failed\n");
4667 return ret;
4668 }
4669 rdev->irq.dpm_thermal = true;
4670 radeon_irq_set(rdev);
4671#if 0
4672 result = ci_send_msg_to_smc(rdev, PPSMC_MSG_EnableThermalInterrupt);
4673
4674 if (result != PPSMC_Result_OK)
4675 DRM_DEBUG_KMS("Could not enable thermal interrupts.\n");
4676#endif
4677 }
4678 4659
4679 ci_enable_auto_throttle_source(rdev, RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL, true); 4660 ci_enable_auto_throttle_source(rdev, RADEON_DPM_AUTO_THROTTLE_SRC_THERMAL, true);
4680 4661
4681 ci_dpm_powergate_uvd(rdev, true);
4682
4683 ci_update_current_ps(rdev, boot_ps); 4662 ci_update_current_ps(rdev, boot_ps);
4684 4663
4685 return 0; 4664 return 0;