4 files changed, 25 insertions, 1 deletions

diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index f10b747024f1..6443d9ea6c11 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -123,6 +123,10 @@ void r100_get_power_state(struct radeon_device *rdev,
                                         rdev->pm.current_power_state_index + 1;
                 }
                 break;
+        case PM_ACTION_DEFAULT:
+                rdev->pm.requested_power_state_index = rdev->pm.default_power_state_index;
+                rdev->pm.can_upclock = false;
+                break;
         case PM_ACTION_NONE:
         default:
                 DRM_ERROR("Requested mode for not defined action\n");
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 35a5d4856f46..4f7f318b5437 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -161,6 +161,11 @@ void r600_get_power_state(struct radeon_device *rdev,
                         }
                         rdev->pm.requested_clock_mode_index = 0;
                         break;
+                case PM_ACTION_DEFAULT:
+                        rdev->pm.requested_power_state_index = rdev->pm.default_power_state_index;
+                        rdev->pm.requested_clock_mode_index = 0;
+                        rdev->pm.can_upclock = false;
+                        break;
                 case PM_ACTION_NONE:
                 default:
                         DRM_ERROR("Requested mode for not defined action\n");
@@ -221,6 +226,11 @@ void r600_get_power_state(struct radeon_device *rdev,
                                 rdev->pm.can_upclock = false;
                         }
                         break;
+                case PM_ACTION_DEFAULT:
+                        rdev->pm.requested_power_state_index = rdev->pm.default_power_state_index;
+                        rdev->pm.requested_clock_mode_index = 0;
+                        rdev->pm.can_upclock = false;
+                        break;
                 case PM_ACTION_NONE:
                 default:
                         DRM_ERROR("Requested mode for not defined action\n");
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index b9ad976cfb9c..5ffb29597af7 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -615,7 +615,8 @@ enum radeon_pm_action {
         PM_ACTION_NONE,
         PM_ACTION_MINIMUM,
         PM_ACTION_DOWNCLOCK,
-        PM_ACTION_UPCLOCK
+        PM_ACTION_UPCLOCK,
+        PM_ACTION_DEFAULT
 };
 
 enum radeon_voltage_type {
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 87814eb8a1b4..23b79ebce6c1 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -125,6 +125,15 @@ int radeon_pm_init(struct radeon_device *rdev)
 
 void radeon_pm_fini(struct radeon_device *rdev)
 {
+        if (rdev->pm.state != PM_STATE_DISABLED) {
+                /* cancel work */
+                cancel_delayed_work_sync(&rdev->pm.idle_work);
+                /* reset default clocks */
+                rdev->pm.state = PM_STATE_DISABLED;
+                rdev->pm.planned_action = PM_ACTION_DEFAULT;
+                radeon_pm_set_clocks(rdev);
+        }
+
         if (rdev->pm.i2c_bus)
                 radeon_i2c_destroy(rdev->pm.i2c_bus);
 }