From 137ce3132b067dcec5816112c564a2200812963d Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 25 Jun 2010 16:21:27 -0400 Subject: [PATCH] --- yaml --- r: 200735 b: refs/heads/master c: 773c3fa3a04bf6c9aa7147813beaab66f38e658f h: refs/heads/master i: 200733: af6b8e66600e3bfc7504a35ba84caf0e7141d369 200731: 2a8e1c8065fa95c16178bfc25e55d32b1c5349e0 200727: be44fba416bcdaece124a1a14646d4ad58d8ec13 200719: 266e3b3ff271ab88e4c1e324cfa3f4a5b5ef1d3a 200703: 6a551968e42efdf2150d8ec1cd4f9729bcc23b4b v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/r600.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4c216f23f87e..00bc3863c61c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f53eb6f84545a7fc55a36657755371f42c63fca +refs/heads/master: 773c3fa3a04bf6c9aa7147813beaab66f38e658f diff --git a/trunk/drivers/gpu/drm/radeon/r600.c b/trunk/drivers/gpu/drm/radeon/r600.c index 90f28175a7bc..3d6645ce2151 100644 --- a/trunk/drivers/gpu/drm/radeon/r600.c +++ b/trunk/drivers/gpu/drm/radeon/r600.c @@ -130,9 +130,14 @@ void r600_pm_get_dynpm_state(struct radeon_device *rdev) break; } } - } else - rdev->pm.requested_power_state_index = - rdev->pm.current_power_state_index - 1; + } else { + if (rdev->pm.current_power_state_index == 0) + rdev->pm.requested_power_state_index = + rdev->pm.num_power_states - 1; + else + rdev->pm.requested_power_state_index = + rdev->pm.current_power_state_index - 1; + } } rdev->pm.requested_clock_mode_index = 0; /* don't use the power state if crtcs are active and no display flag is set */