From 820324c427f0e1da5a167eb6da2fa38656a3d894 Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Tue, 20 Jul 2010 14:17:23 +0200
Subject: [PATCH] --- yaml --- r: 205099 b: refs/heads/master c:
 45d60d1bfcbaa660a510e3b4be5d857ca8d81088 h: refs/heads/master i:   205097:
 d85aeb5a960944f82870fbd27abc4454ae615469   205095:
 1c346c977d56a1430a1e9f786692312655854eff v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_bios.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 07dba5aeaeb0..75a890cfd62f 100644
--- 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
index 3b5523eff43a..aae29cc0cd80 100644
--- 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);