---

yaml --- r: 196513 b: refs/heads/master c: 90c3905 h: refs/heads/master i: 196511: 7555a70 v: v3
git-mirror · May 18, 2010 · 3891e6f · 3891e6f
1 parent 92d14a9
commit 3891e6f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 678e7dfa9e1bb0d1ad31b7cddce58fc3b67cfb27
+refs/heads/master: 90c3905950021a9b37ac1a4dd78225881f4c61e4
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_pm.c b/trunk/drivers/gpu/drm/radeon/radeon_pm.c
@@ -113,7 +113,7 @@ int radeon_pm_init(struct radeon_device *rdev)
 
 	INIT_DELAYED_WORK(&rdev->pm.idle_work, radeon_pm_idle_work_handler);
 
-	if (radeon_dynpm != -1 && radeon_dynpm) {
+	if ((radeon_dynpm != -1 && radeon_dynpm) && (rdev->pm.num_power_states > 1)) {
 		rdev->pm.state = PM_STATE_PAUSED;
 		DRM_INFO("radeon: dynamic power management enabled\n");
 	}