---

yaml --- r: 348069 b: refs/heads/master c: d349357 h: refs/heads/master i: 348067: e270e0a v: v3
git-mirror · Dec 19, 2012 · 503e27e · 503e27e
1 parent 69a7c35
commit 503e27e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f8f635edd8ad5a6416bff4c5ff486500357f473
+refs/heads/master: d3493574e267c203836bfdcb9c58d8af46fc0da1
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_device.c b/trunk/drivers/gpu/drm/radeon/radeon_device.c
@@ -1347,7 +1347,6 @@ int radeon_gpu_reset(struct radeon_device *rdev)
 	}
 
 	radeon_restore_bios_scratch_regs(rdev);
-	drm_helper_resume_force_mode(rdev->ddev);
 
 	if (!r) {
 		for (i = 0; i < RADEON_NUM_RINGS; ++i) {
@@ -1373,6 +1372,8 @@ int radeon_gpu_reset(struct radeon_device *rdev)
 		}
 	}
 
+	drm_helper_resume_force_mode(rdev->ddev);
+
 	ttm_bo_unlock_delayed_workqueue(&rdev->mman.bdev, resched);
 	if (r) {
 		/* bad news, how to tell it to userspace ? */