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>
This commit is contained in:
Francisco Jerez 2010-07-20 14:17:23 +02:00 committed by Ben Skeggs
parent 03cd06ca90
commit 45d60d1bfc
1 changed files with 4 additions and 2 deletions

View File

@ -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);