Commit f7d8e23b authored by Alex Deucher's avatar Alex Deucher Committed by Ben Hutchings

drm/radeon: only adjust default clocks on NI GPUs

commit 2e3b3b10 upstream.

SI asics store voltage information differently so we
don't have a way to deal with it properly yet.
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 49e58269
...@@ -553,7 +553,9 @@ void radeon_pm_suspend(struct radeon_device *rdev) ...@@ -553,7 +553,9 @@ void radeon_pm_suspend(struct radeon_device *rdev)
void radeon_pm_resume(struct radeon_device *rdev) void radeon_pm_resume(struct radeon_device *rdev)
{ {
/* set up the default clocks if the MC ucode is loaded */ /* set up the default clocks if the MC ucode is loaded */
if (ASIC_IS_DCE5(rdev) && rdev->mc_fw) { if ((rdev->family >= CHIP_BARTS) &&
(rdev->family <= CHIP_CAYMAN) &&
rdev->mc_fw) {
if (rdev->pm.default_vddc) if (rdev->pm.default_vddc)
radeon_atom_set_voltage(rdev, rdev->pm.default_vddc, radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
SET_VOLTAGE_TYPE_ASIC_VDDC); SET_VOLTAGE_TYPE_ASIC_VDDC);
...@@ -608,7 +610,9 @@ int radeon_pm_init(struct radeon_device *rdev) ...@@ -608,7 +610,9 @@ int radeon_pm_init(struct radeon_device *rdev)
radeon_pm_print_states(rdev); radeon_pm_print_states(rdev);
radeon_pm_init_profile(rdev); radeon_pm_init_profile(rdev);
/* set up the default clocks if the MC ucode is loaded */ /* set up the default clocks if the MC ucode is loaded */
if (ASIC_IS_DCE5(rdev) && rdev->mc_fw) { if ((rdev->family >= CHIP_BARTS) &&
(rdev->family <= CHIP_CAYMAN) &&
rdev->mc_fw) {
if (rdev->pm.default_vddc) if (rdev->pm.default_vddc)
radeon_atom_set_voltage(rdev, rdev->pm.default_vddc, radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
SET_VOLTAGE_TYPE_ASIC_VDDC); SET_VOLTAGE_TYPE_ASIC_VDDC);
......
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