Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[pandora-kernel.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 6dbfdf4..d4d1c39 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -91,14 +91,24 @@ static struct radeon_power_state * radeon_pick_power_state(struct radeon_device
        default:
                return rdev->pm.default_power_state;
        case POWER_STATE_TYPE_POWERSAVE:
-               wanted_types[0] = POWER_STATE_TYPE_POWERSAVE;
-               wanted_types[1] = POWER_STATE_TYPE_BATTERY;
-               wanted_count = 2;
+               if (rdev->flags & RADEON_IS_MOBILITY) {
+                       wanted_types[0] = POWER_STATE_TYPE_POWERSAVE;
+                       wanted_types[1] = POWER_STATE_TYPE_BATTERY;
+                       wanted_count = 2;
+               } else {
+                       wanted_types[0] = POWER_STATE_TYPE_PERFORMANCE;
+                       wanted_count = 1;
+               }
                break;
        case POWER_STATE_TYPE_BATTERY:
-               wanted_types[0] = POWER_STATE_TYPE_BATTERY;
-               wanted_types[1] = POWER_STATE_TYPE_POWERSAVE;
-               wanted_count = 2;
+               if (rdev->flags & RADEON_IS_MOBILITY) {
+                       wanted_types[0] = POWER_STATE_TYPE_BATTERY;
+                       wanted_types[1] = POWER_STATE_TYPE_POWERSAVE;
+                       wanted_count = 2;
+               } else {
+                       wanted_types[0] = POWER_STATE_TYPE_PERFORMANCE;
+                       wanted_count = 1;
+               }
                break;
        case POWER_STATE_TYPE_BALANCED:
        case POWER_STATE_TYPE_PERFORMANCE:
@@ -143,50 +153,50 @@ static void radeon_get_power_state(struct radeon_device *rdev,
                                   enum radeon_pm_action action)
 {
        switch (action) {
-       case PM_ACTION_NONE:
-       default:
-               rdev->pm.requested_power_state = rdev->pm.current_power_state;
-               rdev->pm.requested_power_state->requested_clock_mode =
-                       rdev->pm.requested_power_state->current_clock_mode;
-               break;
        case PM_ACTION_MINIMUM:
                rdev->pm.requested_power_state = radeon_pick_power_state(rdev, POWER_STATE_TYPE_BATTERY);
-               rdev->pm.requested_power_state->requested_clock_mode =
+               rdev->pm.requested_clock_mode =
                        radeon_pick_clock_mode(rdev, rdev->pm.requested_power_state, POWER_MODE_TYPE_LOW);
                break;
        case PM_ACTION_DOWNCLOCK:
                rdev->pm.requested_power_state = radeon_pick_power_state(rdev, POWER_STATE_TYPE_POWERSAVE);
-               rdev->pm.requested_power_state->requested_clock_mode =
+               rdev->pm.requested_clock_mode =
                        radeon_pick_clock_mode(rdev, rdev->pm.requested_power_state, POWER_MODE_TYPE_MID);
                break;
        case PM_ACTION_UPCLOCK:
                rdev->pm.requested_power_state = radeon_pick_power_state(rdev, POWER_STATE_TYPE_DEFAULT);
-               rdev->pm.requested_power_state->requested_clock_mode =
+               rdev->pm.requested_clock_mode =
                        radeon_pick_clock_mode(rdev, rdev->pm.requested_power_state, POWER_MODE_TYPE_HIGH);
                break;
+       case PM_ACTION_NONE:
+       default:
+               DRM_ERROR("Requested mode for not defined action\n");
+               return;
        }
        DRM_INFO("Requested: e: %d m: %d p: %d\n",
-                rdev->pm.requested_power_state->requested_clock_mode->sclk,
-                rdev->pm.requested_power_state->requested_clock_mode->mclk,
+                rdev->pm.requested_clock_mode->sclk,
+                rdev->pm.requested_clock_mode->mclk,
                 rdev->pm.requested_power_state->non_clock_info.pcie_lanes);
 }
 
 static void radeon_set_power_state(struct radeon_device *rdev)
 {
-       if (rdev->pm.requested_power_state == rdev->pm.current_power_state)
+       /* if *_clock_mode are the same, *_power_state are as well */
+       if (rdev->pm.requested_clock_mode == rdev->pm.current_clock_mode)
                return;
 
        DRM_INFO("Setting: e: %d m: %d p: %d\n",
-                rdev->pm.requested_power_state->requested_clock_mode->sclk,
-                rdev->pm.requested_power_state->requested_clock_mode->mclk,
+                rdev->pm.requested_clock_mode->sclk,
+                rdev->pm.requested_clock_mode->mclk,
                 rdev->pm.requested_power_state->non_clock_info.pcie_lanes);
        /* set pcie lanes */
        /* set voltage */
        /* set engine clock */
-       radeon_set_engine_clock(rdev, rdev->pm.requested_power_state->requested_clock_mode->sclk);
+       radeon_set_engine_clock(rdev, rdev->pm.requested_clock_mode->sclk);
        /* set memory clock */
 
        rdev->pm.current_power_state = rdev->pm.requested_power_state;
+       rdev->pm.current_clock_mode = rdev->pm.requested_clock_mode;
 }
 
 int radeon_pm_init(struct radeon_device *rdev)
@@ -432,6 +442,8 @@ static int radeon_debugfs_pm_info(struct seq_file *m, void *data)
        seq_printf(m, "default memory clock: %u0 kHz\n", rdev->clock.default_mclk);
        if (rdev->asic->get_memory_clock)
                seq_printf(m, "current memory clock: %u0 kHz\n", radeon_get_memory_clock(rdev));
+       if (rdev->asic->get_pcie_lanes)
+               seq_printf(m, "PCIE lanes: %d\n", radeon_get_pcie_lanes(rdev));
 
        return 0;
 }