From 366f2d196fb676c6eba5d394ef70f72507f1790c Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Tue, 27 Apr 2010 13:58:46 -0400 Subject: [PATCH] --- yaml --- r: 196525 b: refs/heads/master c: c37d230af450472183e70947f8e2aa8101a96603 h: refs/heads/master i: 196523: ef2ceb7ac7a784fb57231a1896e891b805cd3dbf v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_pm.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dfb4f2c55a2a..c44d686f5b9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 956ac86d9277b7142f0ad3f24f7fbd4beed0777d +refs/heads/master: c37d230af450472183e70947f8e2aa8101a96603 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_pm.c b/trunk/drivers/gpu/drm/radeon/radeon_pm.c index 79d3336eede5..7cc54c804cb0 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_pm.c +++ b/trunk/drivers/gpu/drm/radeon/radeon_pm.c @@ -58,6 +58,9 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev, int static_switch) { int i; + if (!static_switch) + radeon_get_power_state(rdev, rdev->pm.planned_action); + mutex_lock(&rdev->cp.mutex); /* wait for GPU idle */