From 99fb01928e45009d9e153a3a8f5462942a4ce2cd Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 31 Mar 2010 13:42:50 +1000
Subject: [PATCH] --- yaml --- r: 189372 b: refs/heads/master c:
 08a370fa758fae7e387274ca3571ce625d7f829b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a2306ab8a174..422a311826eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e5786bd14cb9ffe29ebe66d41cedf03311b0d30
+refs/heads/master: 08a370fa758fae7e387274ca3571ce625d7f829b
diff --git a/trunk/drivers/gpu/drm/radeon/rs400.c b/trunk/drivers/gpu/drm/radeon/rs400.c
index 590815c4700e..626aaf082b1a 100644
--- a/trunk/drivers/gpu/drm/radeon/rs400.c
+++ b/trunk/drivers/gpu/drm/radeon/rs400.c
@@ -390,6 +390,8 @@ static int rs400_startup(struct radeon_device *rdev)
 {
 	int r;
 
+	r100_set_common_regs(rdev);
+
 	rs400_mc_program(rdev);
 	/* Resume clock */
 	r300_clock_startup(rdev);