Commit d8852c34 authored by Alex Deucher's avatar Alex Deucher

drm/radeon/dpm: add late_enable for KB/KV

Make sure interrupts are enabled
before we enable thermal interrupts.
Also, don't powergate uvd, etc. until after
the ring tests.
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 90208427
...@@ -1238,6 +1238,30 @@ int kv_dpm_enable(struct radeon_device *rdev) ...@@ -1238,6 +1238,30 @@ int kv_dpm_enable(struct radeon_device *rdev)
return ret; return ret;
} }
int kv_dpm_late_enable(struct radeon_device *rdev)
{
int ret;
if (rdev->irq.installed &&
r600_is_internal_thermal_sensor(rdev->pm.int_thermal_type)) {
ret = kv_set_thermal_temperature_range(rdev, R600_TEMP_RANGE_MIN, R600_TEMP_RANGE_MAX);
if (ret) {
DRM_ERROR("kv_set_thermal_temperature_range failed\n");
return ret;
}
rdev->irq.dpm_thermal = true;
radeon_irq_set(rdev);
}
/* powerdown unused blocks for now */
kv_dpm_powergate_acp(rdev, true);
kv_dpm_powergate_samu(rdev, true);
kv_dpm_powergate_vce(rdev, true);
kv_dpm_powergate_uvd(rdev, true);
return ret;
}
void kv_dpm_disable(struct radeon_device *rdev) void kv_dpm_disable(struct radeon_device *rdev)
{ {
kv_smc_bapm_enable(rdev, false); kv_smc_bapm_enable(rdev, false);
......
...@@ -2169,6 +2169,7 @@ static struct radeon_asic kv_asic = { ...@@ -2169,6 +2169,7 @@ static struct radeon_asic kv_asic = {
.init = &kv_dpm_init, .init = &kv_dpm_init,
.setup_asic = &kv_dpm_setup_asic, .setup_asic = &kv_dpm_setup_asic,
.enable = &kv_dpm_enable, .enable = &kv_dpm_enable,
.late_enable = &kv_dpm_late_enable,
.disable = &kv_dpm_disable, .disable = &kv_dpm_disable,
.pre_set_power_state = &kv_dpm_pre_set_power_state, .pre_set_power_state = &kv_dpm_pre_set_power_state,
.set_power_state = &kv_dpm_set_power_state, .set_power_state = &kv_dpm_set_power_state,
......
...@@ -776,6 +776,7 @@ void ci_dpm_powergate_uvd(struct radeon_device *rdev, bool gate); ...@@ -776,6 +776,7 @@ void ci_dpm_powergate_uvd(struct radeon_device *rdev, bool gate);
int kv_dpm_init(struct radeon_device *rdev); int kv_dpm_init(struct radeon_device *rdev);
int kv_dpm_enable(struct radeon_device *rdev); int kv_dpm_enable(struct radeon_device *rdev);
int kv_dpm_late_enable(struct radeon_device *rdev);
void kv_dpm_disable(struct radeon_device *rdev); void kv_dpm_disable(struct radeon_device *rdev);
int kv_dpm_pre_set_power_state(struct radeon_device *rdev); int kv_dpm_pre_set_power_state(struct radeon_device *rdev);
int kv_dpm_set_power_state(struct radeon_device *rdev); int kv_dpm_set_power_state(struct radeon_device *rdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment