Skip to content

Commit

Permalink
drm/nouveau: Reset CRTC owner to 0 before BIOS init.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Francisco Jerez authored and Ben Skeggs committed Jul 26, 2010
1 parent 03cd06c commit 45d60d1
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/gpu/drm/nouveau/nouveau_bios.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 45d60d1

Please sign in to comment.