drm/radeon/dpm: add late_enable for rv7xx-NI
Make sure interrupts are enabled before we enable thermal interrupts. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
a4643ba340
commit
a3f1124515
|
@ -1241,6 +1241,7 @@ static struct radeon_asic rv770_asic = {
|
||||||
.init = &rv770_dpm_init,
|
.init = &rv770_dpm_init,
|
||||||
.setup_asic = &rv770_dpm_setup_asic,
|
.setup_asic = &rv770_dpm_setup_asic,
|
||||||
.enable = &rv770_dpm_enable,
|
.enable = &rv770_dpm_enable,
|
||||||
|
.late_enable = &rv770_dpm_late_enable,
|
||||||
.disable = &rv770_dpm_disable,
|
.disable = &rv770_dpm_disable,
|
||||||
.pre_set_power_state = &r600_dpm_pre_set_power_state,
|
.pre_set_power_state = &r600_dpm_pre_set_power_state,
|
||||||
.set_power_state = &rv770_dpm_set_power_state,
|
.set_power_state = &rv770_dpm_set_power_state,
|
||||||
|
@ -1359,6 +1360,7 @@ static struct radeon_asic evergreen_asic = {
|
||||||
.init = &cypress_dpm_init,
|
.init = &cypress_dpm_init,
|
||||||
.setup_asic = &cypress_dpm_setup_asic,
|
.setup_asic = &cypress_dpm_setup_asic,
|
||||||
.enable = &cypress_dpm_enable,
|
.enable = &cypress_dpm_enable,
|
||||||
|
.late_enable = &rv770_dpm_late_enable,
|
||||||
.disable = &cypress_dpm_disable,
|
.disable = &cypress_dpm_disable,
|
||||||
.pre_set_power_state = &r600_dpm_pre_set_power_state,
|
.pre_set_power_state = &r600_dpm_pre_set_power_state,
|
||||||
.set_power_state = &cypress_dpm_set_power_state,
|
.set_power_state = &cypress_dpm_set_power_state,
|
||||||
|
@ -1542,6 +1544,7 @@ static struct radeon_asic btc_asic = {
|
||||||
.init = &btc_dpm_init,
|
.init = &btc_dpm_init,
|
||||||
.setup_asic = &btc_dpm_setup_asic,
|
.setup_asic = &btc_dpm_setup_asic,
|
||||||
.enable = &btc_dpm_enable,
|
.enable = &btc_dpm_enable,
|
||||||
|
.late_enable = &rv770_dpm_late_enable,
|
||||||
.disable = &btc_dpm_disable,
|
.disable = &btc_dpm_disable,
|
||||||
.pre_set_power_state = &btc_dpm_pre_set_power_state,
|
.pre_set_power_state = &btc_dpm_pre_set_power_state,
|
||||||
.set_power_state = &btc_dpm_set_power_state,
|
.set_power_state = &btc_dpm_set_power_state,
|
||||||
|
@ -1685,6 +1688,7 @@ static struct radeon_asic cayman_asic = {
|
||||||
.init = &ni_dpm_init,
|
.init = &ni_dpm_init,
|
||||||
.setup_asic = &ni_dpm_setup_asic,
|
.setup_asic = &ni_dpm_setup_asic,
|
||||||
.enable = &ni_dpm_enable,
|
.enable = &ni_dpm_enable,
|
||||||
|
.late_enable = &rv770_dpm_late_enable,
|
||||||
.disable = &ni_dpm_disable,
|
.disable = &ni_dpm_disable,
|
||||||
.pre_set_power_state = &ni_dpm_pre_set_power_state,
|
.pre_set_power_state = &ni_dpm_pre_set_power_state,
|
||||||
.set_power_state = &ni_dpm_set_power_state,
|
.set_power_state = &ni_dpm_set_power_state,
|
||||||
|
|
|
@ -455,6 +455,7 @@ int rv770_get_temp(struct radeon_device *rdev);
|
||||||
/* rv7xx pm */
|
/* rv7xx pm */
|
||||||
int rv770_dpm_init(struct radeon_device *rdev);
|
int rv770_dpm_init(struct radeon_device *rdev);
|
||||||
int rv770_dpm_enable(struct radeon_device *rdev);
|
int rv770_dpm_enable(struct radeon_device *rdev);
|
||||||
|
int rv770_dpm_late_enable(struct radeon_device *rdev);
|
||||||
void rv770_dpm_disable(struct radeon_device *rdev);
|
void rv770_dpm_disable(struct radeon_device *rdev);
|
||||||
int rv770_dpm_set_power_state(struct radeon_device *rdev);
|
int rv770_dpm_set_power_state(struct radeon_device *rdev);
|
||||||
void rv770_dpm_setup_asic(struct radeon_device *rdev);
|
void rv770_dpm_setup_asic(struct radeon_device *rdev);
|
||||||
|
|
|
@ -1986,6 +1986,28 @@ int rv770_dpm_enable(struct radeon_device *rdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int rv770_dpm_late_enable(struct radeon_device *rdev)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
if (rdev->irq.installed &&
|
||||||
|
r600_is_internal_thermal_sensor(rdev->pm.int_thermal_type)) {
|
||||||
|
PPSMC_Result result;
|
||||||
|
|
||||||
|
ret = rv770_set_thermal_temperature_range(rdev, R600_TEMP_RANGE_MIN, R600_TEMP_RANGE_MAX);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
rdev->irq.dpm_thermal = true;
|
||||||
|
radeon_irq_set(rdev);
|
||||||
|
result = rv770_send_msg_to_smc(rdev, PPSMC_MSG_EnableThermalInterrupt);
|
||||||
|
|
||||||
|
if (result != PPSMC_Result_OK)
|
||||||
|
DRM_DEBUG_KMS("Could not enable thermal interrupts.\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
void rv770_dpm_disable(struct radeon_device *rdev)
|
void rv770_dpm_disable(struct radeon_device *rdev)
|
||||||
{
|
{
|
||||||
struct rv7xx_power_info *pi = rv770_get_pi(rdev);
|
struct rv7xx_power_info *pi = rv770_get_pi(rdev);
|
||||||
|
|
Loading…
Reference in New Issue