drm/radeon: only adjust default clocks on NI GPUs
authorAlex Deucher <alexander.deucher@amd.com>
Fri, 14 Sep 2012 14:59:26 +0000 (10:59 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 27 Sep 2012 14:22:41 +0000 (10:22 -0400)
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
drivers/gpu/drm/radeon/radeon_pm.c

index c15e505..e024435 100644 (file)
@@ -521,7 +521,9 @@ void radeon_pm_suspend(struct radeon_device *rdev)
 void radeon_pm_resume(struct radeon_device *rdev)
 {
        /* 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)
                        radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
                                                SET_VOLTAGE_TYPE_ASIC_VDDC);
@@ -576,7 +578,9 @@ int radeon_pm_init(struct radeon_device *rdev)
                radeon_pm_print_states(rdev);
                radeon_pm_init_profile(rdev);
                /* 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)
                                radeon_atom_set_voltage(rdev, rdev->pm.default_vddc,
                                                        SET_VOLTAGE_TYPE_ASIC_VDDC);