---

yaml --- r: 345441 b: refs/heads/master c: 647bf61 h: refs/heads/master i: 345439: 69dfccc v: v3
git-mirror · Nov 28, 2012 · 83b4457 · 83b4457
1 parent 32bc953
commit 83b4457
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63718a0730c666edcac94c261d1df5edef80fd23
+refs/heads/master: 647bf61d0399515c526c125450cadaade79b1988
diff --git a/trunk/drivers/gpu/drm/nouveau/nvd0_display.c b/trunk/drivers/gpu/drm/nouveau/nvd0_display.c
@@ -1863,14 +1863,8 @@ nvd0_display_init(struct drm_device *dev)
 	if (push) {
 		evo_mthd(push, 0x0088, 1);
 		evo_data(push, NvEvoSync);
-		evo_mthd(push, 0x0084, 1);
-		evo_data(push, 0x00000000);
-		evo_mthd(push, 0x0084, 1);
-		evo_data(push, 0x80000000);
-		evo_mthd(push, 0x008c, 1);
-		evo_data(push, 0x00000000);
 		evo_kick(push, nvd0_mast(dev));
-		return 0;
+		return evo_sync(dev);
 	}
 
 	return -EBUSY;