diff options
| author | Maxim Levitsky | 2011-10-09 22:58:35 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2011-12-21 10:01:17 +0100 |
| commit | 71d91f655e549b0eeeb788decad7791ca6a0885b (patch) | |
| tree | d13367278e53b06f1710241eb31263c646bf1d3b /drivers/gpu/drm/nouveau/nouveau_drv.c | |
| parent | drm/nouveau: disable output polling through suspend. (diff) | |
| download | kernel-qcow2-linux-71d91f655e549b0eeeb788decad7791ca6a0885b.tar.gz kernel-qcow2-linux-71d91f655e549b0eeeb788decad7791ca6a0885b.tar.xz kernel-qcow2-linux-71d91f655e549b0eeeb788decad7791ca6a0885b.zip | |
drm/nouveau: restore performance mode a bit later.
Otherwice code that responsible for idling the card can't work.
BIOS init tables are supposed to init the clocks to correct values,
so that shouldn't cause any problems (we don't reclock by default anyway)
Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index 982505b1be58..1e1b4a47b700 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c @@ -298,8 +298,6 @@ nouveau_pci_resume(struct pci_dev *pdev) if (ret) return ret; - nouveau_pm_resume(dev); - if (dev_priv->gart_info.type == NOUVEAU_GART_AGP) { ret = nouveau_mem_init_agp(dev); if (ret) { @@ -339,6 +337,8 @@ nouveau_pci_resume(struct pci_dev *pdev) } } + nouveau_pm_resume(dev); + NV_INFO(dev, "Restoring mode...\n"); list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { struct nouveau_framebuffer *nouveau_fb; |