diff --git a/[refs] b/[refs]
index a44d22d3d18e..3451a8f31126 100644
--- 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
index a137ee2f722c..811126464a7b 100644
--- 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");
 	}