From 3891e6f617436221a22a7effc766d3bbe4c02f91 Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Wed, 24 Mar 2010 11:32:29 -0400 Subject: [PATCH] --- yaml --- r: 196513 b: refs/heads/master c: 90c3905950021a9b37ac1a4dd78225881f4c61e4 h: refs/heads/master i: 196511: 7555a70bfc145c04a47f01d1a0f4d781ce8f1ca3 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_pm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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"); }