drm/radeon/dpm: remove broken dyn state remnants

Now that the proper fix has been implemented I can
remove the last remnants of the initial implementation.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index c5d83c145cc7c13bb6d367b2857459d3e15a73ae..d41c3843d3db4ece871d051c237bb297de3a4a76 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1302,7 +1302,6 @@ struct radeon_dpm {
        struct radeon_ps        *boot_ps;
        /* default uvd power state */
        struct radeon_ps        *uvd_ps;
-       struct radeon_ps        hw_ps;
        enum radeon_pm_state_type state;
        enum radeon_pm_state_type user_state;
        u32                     platform_caps;

diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 4e2ccc6b75fbcc33b38157cc89f4a386dccd95ba..2f70c1b195d90d4d4d21409ff4585402c1a57234 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -684,17 +684,6 @@ restart_search:
        return NULL;
 }
 
-static void radeon_dpm_update_requested_ps(struct radeon_device *rdev,
-                                          struct radeon_ps *ps)
-{
-       /* copy the ps to the hw ps and point the requested ps
-        * at the hw state in case the driver wants to modify
-        * the state dynamically.
-        */
-       rdev->pm.dpm.hw_ps = *ps;
-       rdev->pm.dpm.requested_ps = &rdev->pm.dpm.hw_ps;
-}
-
 static void radeon_dpm_change_power_state_locked(struct radeon_device *rdev)
 {
        int i;
@@ -716,7 +705,7 @@ static void radeon_dpm_change_power_state_locked(struct radeon_device *rdev)
 
        ps = radeon_dpm_pick_power_state(rdev, dpm_state);
        if (ps)
-               radeon_dpm_update_requested_ps(rdev, ps);
+               rdev->pm.dpm.requested_ps = ps;
        else
                return;
 
@@ -767,11 +756,9 @@ static void radeon_dpm_change_power_state_locked(struct radeon_device *rdev)
        down_write(&rdev->pm.mclk_lock);
        mutex_lock(&rdev->ring_lock);
 
-       if (rdev->asic->dpm.pre_set_power_state) {
-               ret = radeon_dpm_pre_set_power_state(rdev);
-               if (ret)
-                       goto done;
-       }
+       ret = radeon_dpm_pre_set_power_state(rdev);
+       if (ret)
+               goto done;
 
        /* update display watermarks based on new power state */
        radeon_bandwidth_update(rdev);
@@ -794,8 +781,7 @@ static void radeon_dpm_change_power_state_locked(struct radeon_device *rdev)
        /* update current power state */
        rdev->pm.dpm.current_ps = rdev->pm.dpm.requested_ps;
 
-       if (rdev->asic->dpm.post_set_power_state)
-               radeon_dpm_post_set_power_state(rdev);
+       radeon_dpm_post_set_power_state(rdev);
 
 done:
        mutex_unlock(&rdev->ring_lock);