From: Francisco Jerez <currojerez@riseup.net>
Date: Tue, 20 Jul 2010 12:17:23 +0000 (+0200)
Subject: drm/nouveau: Reset CRTC owner to 0 before BIOS init.
X-Git-Tag: v2.6.36-rc1~540^2~19^2~14
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=45d60d1bfcbaa660a510e3b4be5d857ca8d81088;p=net-next-2.6.git

drm/nouveau: Reset CRTC owner to 0 before BIOS init.

Fixes suspend+multihead on some boards that also use BIOS scripts for
modesetting.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
index 3b5523eff43..aae29cc0cd8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/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);