From 7555a70bfc145c04a47f01d1a0f4d781ce8f1ca3 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexdeucher@gmail.com>
Date: Mon, 22 Mar 2010 13:34:22 -0400
Subject: [PATCH] --- yaml --- r: 196511 b: refs/heads/master c:
 c00f53be5ec70038d7a34f64872df51dabfc5a5b h: refs/heads/master i:   196509:
 592f093605b6107c8009a2f02d3140146b3abae3   196507:
 f43bb009c85fa56819d66a38763c3a98f5def902   196503:
 f4421376496ff54c2bcfac97125f99808e3912ac   196495:
 2ab8ed72d59a1ce12c4085d2be0e78705beca0be   196479:
 a81a123f2a4c0479d10273a33240dadaefa62f0d v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon_pm.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 64b0502cb19b..779a95869b0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a48b9b4edb8bb87deb13b9f088a595cf71457b69
+refs/heads/master: c00f53be5ec70038d7a34f64872df51dabfc5a5b
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_pm.c b/trunk/drivers/gpu/drm/radeon/radeon_pm.c
index 10ef8924799d..a137ee2f722c 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_pm.c
@@ -293,6 +293,11 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev)
 		}
 	}
 
+	/* update display watermarks based on new power state */
+	radeon_update_bandwidth_info(rdev);
+	if (rdev->pm.active_crtc_count)
+		radeon_bandwidth_update(rdev);
+
 	mutex_unlock(&rdev->cp.mutex);
 }