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>

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index 982505b1be589c39b8c15b5d78c6b0d164782d41..1e1b4a47b700ac71caa988c0a6069b8681ea2b71 100644 (file)
--- 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;