---

yaml --- r: 168480 b: refs/heads/master c: ea1495a h: refs/heads/master v: v3
git-mirror · Oct 28, 2009 · 0c9c7f0 · 0c9c7f0
1 parent 58d6fdc
commit 0c9c7f0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc7f7119d2ed97fff1aaddad6bf7d61ed446cf37
+refs/heads/master: ea1495a6274c9542a168337536f8ce74d1173f23
diff --git a/trunk/drivers/gpu/drm/radeon/rs400.c b/trunk/drivers/gpu/drm/radeon/rs400.c
@@ -418,6 +418,8 @@ int rs400_resume(struct radeon_device *rdev)
 	rs400_gart_disable(rdev);
 	/* Resume clock before doing reset */
 	r300_clock_startup(rdev);
+	/* setup MC before calling post tables */
+	rs400_mc_program(rdev);
 	/* Reset gpu before posting otherwise ATOM will enter infinite loop */
 	if (radeon_gpu_reset(rdev)) {
 		dev_warn(rdev->dev, "GPU reset failed ! (0xE40=0x%08X, 0x7C0=0x%08X)\n",