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 3b5523eff43a742c1a3b7f460799f11a61ffd821..aae29cc0cd806f67dd36cab1753085ee02df06f7 100644 (file)
--- 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);