---

yaml --- r: 200735 b: refs/heads/master c: 773c3fa h: refs/heads/master i: 200733: af6b8e6 200731: 2a8e1c8 200727: be44fba 200719: 266e3b3 200703: 6a55196 v: v3
git-mirror · Jul 1, 2010 · 137ce31 · 137ce31
1 parent c2dfdda
commit 137ce31
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -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 */