drm/radeon/pm: move pm handling into the asic specific code

[deliverable/linux.git] / drivers / gpu / drm / radeon / radeon_pm.c

diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 7fc76d165e8995cb391d4f96f1d20c9481bb2ea6..933ada0147b57b5ed9890f8bb09aa14f784c8d36 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -1034,10 +1034,6 @@ static void radeon_pm_resume_dpm(struct radeon_device *rdev)
        mutex_unlock(&rdev->pm.mutex);
        if (ret)
                goto dpm_resume_fail;
-       ret = radeon_pm_late_init(rdev);
-       if (ret)
-               goto dpm_resume_fail;
-
        rdev->pm.dpm_enabled = true;
        radeon_pm_compute_clocks(rdev);
        return;
@@ -1176,13 +1172,9 @@ static int radeon_pm_init_dpm(struct radeon_device *rdev)
        radeon_dpm_setup_asic(rdev);
        ret = radeon_dpm_enable(rdev);
        mutex_unlock(&rdev->pm.mutex);
-       if (ret)
-               goto dpm_failed;
-       ret = radeon_pm_late_init(rdev);
        if (ret)
                goto dpm_failed;
        rdev->pm.dpm_enabled = true;
-       radeon_pm_compute_clocks(rdev);
 
        ret = device_create_file(rdev->dev, &dev_attr_power_dpm_state);
        if (ret)
@@ -1441,6 +1433,9 @@ static void radeon_pm_compute_clocks_dpm(struct radeon_device *rdev)
        struct drm_crtc *crtc;
        struct radeon_crtc *radeon_crtc;
 
+       if (!rdev->pm.dpm_enabled)
+               return;
+
        mutex_lock(&rdev->pm.mutex);
 
        /* update active crtc counts */