---

yaml --- r: 205099 b: refs/heads/master c: 45d60d1 h: refs/heads/master i: 205097: d85aeb5 205095: 1c346c9 v: v3
git-mirror · Jul 26, 2010 · 820324c · 820324c
1 parent 1ce5923
commit 820324c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03cd06ca9046190e8418749c2c8f636e2625556c
+refs/heads/master: 45d60d1bfcbaa660a510e3b4be5d857ca8d81088
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -6551,8 +6551,10 @@ nouveau_run_vbios_init(struct drm_device *dev)
 	int i, ret = 0;
 
 	NVLockVgaCrtcs(dev, false);
-	if (nv_two_heads(dev))
-		NVSetOwner(dev, bios->state.crtchead);
+	if (nv_two_heads(dev)) {
+		bios->state.crtchead = 0;
+		NVSetOwner(dev, 0);
+	}
 
 	if (bios->major_version < 5)	/* BMP only */
 		load_nv17_hw_sequencer_ucode(dev, bios);