From 470f89e6649455058892a4cd50f0ad44c9bf39e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Sun, 21 Feb 2010 22:46:30 +0000
Subject: [PATCH] --- yaml --- r: 185599 b: refs/heads/master c:
 08ff2a7a7a13c562e81a406722193f43cbb4e4ef h: refs/heads/master i:   185597:
 169d6b14e417971ea0309e02034646e3eb4a8378   185595:
 ea04408f30dd3d7821998f84a0bb27b3da72671f   185591:
 cbd9d7d105cf2af259682cecd33b19d0cea3cadd   185583:
 8aaba36e45bdf1aa03050117086f8fc34e995791   185567:
 e659809f3b53d6bc142046dd4b3b939a8f94848a   185535:
 bffd20c1b5aaf46cb22ac9fc46b7710bd4a17ad3   185471:
 93204787ad34ed8abf31892cbd1d2fe8dbff159e   185343:
 a57c266fd43afe1becee8f26cd1aeadee4a34254 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/gpu/drm/radeon/radeon_pm.c | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 4c7f645d6b2b..30d59d752b24 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9038dfdf699a3227004f1f6da32a3ef4ef3ba5a4
+refs/heads/master: 08ff2a7a7a13c562e81a406722193f43cbb4e4ef
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_pm.c b/trunk/drivers/gpu/drm/radeon/radeon_pm.c
index 8960acf14155..d174d93c9386 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/trunk/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: