drm/radeon/NI: fix TDP adjustment in set_power_state
Fixes hangs with DPM in some cases. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
6e764764d5
commit
728cf6bb4d
|
@ -3719,7 +3719,7 @@ void ni_dpm_disable(struct radeon_device *rdev)
|
||||||
ni_update_current_ps(rdev, boot_ps);
|
ni_update_current_ps(rdev, boot_ps);
|
||||||
}
|
}
|
||||||
|
|
||||||
int ni_power_control_set_level(struct radeon_device *rdev)
|
static int ni_power_control_set_level(struct radeon_device *rdev)
|
||||||
{
|
{
|
||||||
struct radeon_ps *new_ps = rdev->pm.dpm.requested_ps;
|
struct radeon_ps *new_ps = rdev->pm.dpm.requested_ps;
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -3736,7 +3736,9 @@ int ni_power_control_set_level(struct radeon_device *rdev)
|
||||||
ret = rv770_resume_smc(rdev);
|
ret = rv770_resume_smc(rdev);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
rv770_set_sw_state(rdev);
|
ret = rv770_set_sw_state(rdev);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -3801,11 +3803,6 @@ int ni_dpm_set_power_state(struct radeon_device *rdev)
|
||||||
DRM_ERROR("ni_program_memory_timing_parameters failed\n");
|
DRM_ERROR("ni_program_memory_timing_parameters failed\n");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
ret = ni_populate_smc_tdp_limits(rdev, new_ps);
|
|
||||||
if (ret) {
|
|
||||||
DRM_ERROR("ni_populate_smc_tdp_limits failed\n");
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
ret = rv770_resume_smc(rdev);
|
ret = rv770_resume_smc(rdev);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
DRM_ERROR("rv770_resume_smc failed\n");
|
DRM_ERROR("rv770_resume_smc failed\n");
|
||||||
|
@ -3828,6 +3825,13 @@ int ni_dpm_set_power_state(struct radeon_device *rdev)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* update tdp */
|
||||||
|
ret = ni_power_control_set_level(rdev);
|
||||||
|
if (ret) {
|
||||||
|
DRM_ERROR("ni_power_control_set_level failed\n");
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
/* XXX */
|
/* XXX */
|
||||||
ret = ni_unrestrict_performance_levels_after_switch(rdev);
|
ret = ni_unrestrict_performance_levels_after_switch(rdev);
|
||||||
|
|
Loading…
Reference in a new issue