diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-07-20 14:17:23 +0200 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-26 03:42:47 +0200 |
| commit | 45d60d1bfcbaa660a510e3b4be5d857ca8d81088 (patch) | |
| tree | b94ebaa460e78915c11b0503fac6f48d14f88787 /drivers/gpu/drm/nouveau | |
| parent | drm/nouveau: No need to lock/unlock the VGA CRTC regs all the time. (diff) | |
| download | linux-45d60d1bfcbaa660a510e3b4be5d857ca8d81088.tar.xz linux-45d60d1bfcbaa660a510e3b4be5d857ca8d81088.zip | |
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) 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); |