From d6ea7d1e733f3fa0750e692e1d552803195ef4a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <daenzer@vmware.com>
Date: Thu, 17 Sep 2009 09:42:28 +0200
Subject: [PATCH] --- yaml --- r: 164027 b: refs/heads/master c:
 5e6dde7ec2e72f49ff749204efc03a59478d7d34 h: refs/heads/master i:   164025:
 a6e0a6e7a622e4b21e2833e7915c5843be29da59   164023:
 6a98eacaf8df4bc4197c8e6168ff88c7e2a6ba2a v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/radeon/r600.c          | 1 +
 trunk/drivers/gpu/drm/radeon/radeon_device.c | 4 ++--
 trunk/drivers/gpu/drm/radeon/rv770.c         | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5fcf716a56da..9bef698f1b0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 445282db9e815e7f5e82761c3c971dc9ea988d85
+refs/heads/master: 5e6dde7ec2e72f49ff749204efc03a59478d7d34
diff --git a/trunk/drivers/gpu/drm/radeon/r600.c b/trunk/drivers/gpu/drm/radeon/r600.c
index af430d719e7f..1e1cab5ef1e4 100644
--- a/trunk/drivers/gpu/drm/radeon/r600.c
+++ b/trunk/drivers/gpu/drm/radeon/r600.c
@@ -1537,6 +1537,7 @@ int r600_init(struct radeon_device *rdev)
 	r600_scratch_init(rdev);
 	/* Initialize surface registers */
 	radeon_surface_init(rdev);
+	radeon_get_clock_info(rdev->ddev);
 	r = radeon_clocks_init(rdev);
 	if (r)
 		return r;
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_device.c b/trunk/drivers/gpu/drm/radeon/radeon_device.c
index 0b5014c2ae7f..8a40c616b534 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_device.c
+++ b/trunk/drivers/gpu/drm/radeon/radeon_device.c
@@ -386,7 +386,6 @@ int radeon_clocks_init(struct radeon_device *rdev)
 {
 	int r;
 
-	radeon_get_clock_info(rdev->ddev);
 	r = radeon_static_clocks_init(rdev->ddev);
 	if (r) {
 		return r;
@@ -617,7 +616,8 @@ int radeon_device_init(struct radeon_device *rdev,
 				radeon_combios_asic_init(rdev->ddev);
 			}
 		}
-		/* Get vram informations */
+		/* Get clock & vram information */
+		radeon_get_clock_info(rdev->ddev);
 		radeon_vram_info(rdev);
 		/* Initialize clocks */
 		r = radeon_clocks_init(rdev);
diff --git a/trunk/drivers/gpu/drm/radeon/rv770.c b/trunk/drivers/gpu/drm/radeon/rv770.c
index be2f86539ebc..8bab6b4f05d1 100644
--- a/trunk/drivers/gpu/drm/radeon/rv770.c
+++ b/trunk/drivers/gpu/drm/radeon/rv770.c
@@ -917,6 +917,7 @@ int rv770_init(struct radeon_device *rdev)
 	r600_scratch_init(rdev);
 	/* Initialize surface registers */
 	radeon_surface_init(rdev);
+	radeon_get_clock_info(rdev->ddev);
 	r = radeon_clocks_init(rdev);
 	if (r)
 		return r;