diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-07-20 08:17:23 -0400 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-25 21:42:47 -0400 |
| commit | 45d60d1bfcbaa660a510e3b4be5d857ca8d81088 (patch) | |
| tree | b94ebaa460e78915c11b0503fac6f48d14f88787 /drivers/gpu/drm/nouveau | |
| parent | 03cd06ca9046190e8418749c2c8f636e2625556c (diff) | |
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>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index 3b5523eff43a..aae29cc0cd80 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) | |||
| 6551 | int i, ret = 0; | 6551 | int i, ret = 0; |
| 6552 | 6552 | ||
| 6553 | NVLockVgaCrtcs(dev, false); | 6553 | NVLockVgaCrtcs(dev, false); |
| 6554 | if (nv_two_heads(dev)) | 6554 | if (nv_two_heads(dev)) { |
| 6555 | NVSetOwner(dev, bios->state.crtchead); | 6555 | bios->state.crtchead = 0; |
| 6556 | NVSetOwner(dev, 0); | ||
| 6557 | } | ||
| 6556 | 6558 | ||
| 6557 | if (bios->major_version < 5) /* BMP only */ | 6559 | if (bios->major_version < 5) /* BMP only */ |
| 6558 | load_nv17_hw_sequencer_ucode(dev, bios); | 6560 | load_nv17_hw_sequencer_ucode(dev, bios); |