diff options
| author | Alex Deucher <alexander.deucher@amd.com> | 2012-09-14 10:59:26 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2012-09-27 10:22:41 -0400 |
| commit | 2e3b3b105ab3bb5b6a37198da4f193cd13781d13 (patch) | |
| tree | 8e321ad7f9d27d1f29c3b50c581dfb1a8039b0ad | |
| parent | c0fd0834aa0ec6b8e3bb97876b842f7b123c54d3 (diff) | |
drm/radeon: only adjust default clocks on NI GPUs
SI asics store voltage information differently so we
don't have a way to deal with it properly yet.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_pm.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index c15e505a15bc..e024435a856c 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c | |||
| @@ -521,7 +521,9 @@ void radeon_pm_suspend(struct radeon_device *rdev) | |||
| 521 | void radeon_pm_resume(struct radeon_device *rdev) | 521 | void radeon_pm_resume(struct radeon_device *rdev) |
| 522 | { | 522 | { |
| 523 | /* set up the default clocks if the MC ucode is loaded */ | 523 | /* set up the default clocks if the MC ucode is loaded */ |
| 524 | if (ASIC_IS_DCE5(rdev) && rdev->mc_fw) { | 524 | if ((rdev->family >= CHIP_BARTS) && |
| 525 | (rdev->family <= CHIP_CAYMAN) && | ||
| 526 | rdev->mc_fw) { | ||
| 525 | if (rdev->pm.default_vddc) | 527 | if (rdev->pm.default_vddc) |
| 526 | radeon_atom_set_voltage(rdev, rdev->pm.default_vddc, | 528 | radeon_atom_set_voltage(rdev, rdev->pm.default_vddc, |
| 527 | SET_VOLTAGE_TYPE_ASIC_VDDC); | 529 | SET_VOLTAGE_TYPE_ASIC_VDDC); |
| @@ -576,7 +578,9 @@ int radeon_pm_init(struct radeon_device *rdev) | |||
| 576 | radeon_pm_print_states(rdev); | 578 | radeon_pm_print_states(rdev); |
| 577 | radeon_pm_init_profile(rdev); | 579 | radeon_pm_init_profile(rdev); |
| 578 | /* set up the default clocks if the MC ucode is loaded */ | 580 | /* set up the default clocks if the MC ucode is loaded */ |
| 579 | if (ASIC_IS_DCE5(rdev) && rdev->mc_fw) { | 581 | if ((rdev->family >= CHIP_BARTS) && |
| 582 | (rdev->family <= CHIP_CAYMAN) && | ||
| 583 | rdev->mc_fw) { | ||
| 580 | if (rdev->pm.default_vddc) | 584 | if (rdev->pm.default_vddc) |
| 581 | radeon_atom_set_voltage(rdev, rdev->pm.default_vddc, | 585 | radeon_atom_set_voltage(rdev, rdev->pm.default_vddc, |
| 582 | SET_VOLTAGE_TYPE_ASIC_VDDC); | 586 | SET_VOLTAGE_TYPE_ASIC_VDDC); |
