drm/radeon/dpm: add late_enable for trinity
Need to wait to enable cg and pg until after ring tests. Also 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
14ec9faba3
commit
bda44c1ae7
|
@ -1790,6 +1790,7 @@ static struct radeon_asic trinity_asic = {
|
||||||
.init = &trinity_dpm_init,
|
.init = &trinity_dpm_init,
|
||||||
.setup_asic = &trinity_dpm_setup_asic,
|
.setup_asic = &trinity_dpm_setup_asic,
|
||||||
.enable = &trinity_dpm_enable,
|
.enable = &trinity_dpm_enable,
|
||||||
|
.late_enable = &trinity_dpm_late_enable,
|
||||||
.disable = &trinity_dpm_disable,
|
.disable = &trinity_dpm_disable,
|
||||||
.pre_set_power_state = &trinity_dpm_pre_set_power_state,
|
.pre_set_power_state = &trinity_dpm_pre_set_power_state,
|
||||||
.set_power_state = &trinity_dpm_set_power_state,
|
.set_power_state = &trinity_dpm_set_power_state,
|
||||||
|
|
|
@ -613,6 +613,7 @@ int ni_dpm_force_performance_level(struct radeon_device *rdev,
|
||||||
bool ni_dpm_vblank_too_short(struct radeon_device *rdev);
|
bool ni_dpm_vblank_too_short(struct radeon_device *rdev);
|
||||||
int trinity_dpm_init(struct radeon_device *rdev);
|
int trinity_dpm_init(struct radeon_device *rdev);
|
||||||
int trinity_dpm_enable(struct radeon_device *rdev);
|
int trinity_dpm_enable(struct radeon_device *rdev);
|
||||||
|
int trinity_dpm_late_enable(struct radeon_device *rdev);
|
||||||
void trinity_dpm_disable(struct radeon_device *rdev);
|
void trinity_dpm_disable(struct radeon_device *rdev);
|
||||||
int trinity_dpm_pre_set_power_state(struct radeon_device *rdev);
|
int trinity_dpm_pre_set_power_state(struct radeon_device *rdev);
|
||||||
int trinity_dpm_set_power_state(struct radeon_device *rdev);
|
int trinity_dpm_set_power_state(struct radeon_device *rdev);
|
||||||
|
|
|
@ -1121,6 +1121,28 @@ int trinity_dpm_enable(struct radeon_device *rdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int trinity_dpm_late_enable(struct radeon_device *rdev)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
trinity_acquire_mutex(rdev);
|
||||||
|
trinity_enable_clock_power_gating(rdev);
|
||||||
|
|
||||||
|
if (rdev->irq.installed &&
|
||||||
|
r600_is_internal_thermal_sensor(rdev->pm.int_thermal_type)) {
|
||||||
|
ret = trinity_set_thermal_temperature_range(rdev, R600_TEMP_RANGE_MIN, R600_TEMP_RANGE_MAX);
|
||||||
|
if (ret) {
|
||||||
|
trinity_release_mutex(rdev);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
rdev->irq.dpm_thermal = true;
|
||||||
|
radeon_irq_set(rdev);
|
||||||
|
}
|
||||||
|
trinity_release_mutex(rdev);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
void trinity_dpm_disable(struct radeon_device *rdev)
|
void trinity_dpm_disable(struct radeon_device *rdev)
|
||||||
{
|
{
|
||||||
trinity_acquire_mutex(rdev);
|
trinity_acquire_mutex(rdev);
|
||||||
|
|
Loading…
Reference in a new issue