diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2010-09-16 23:35:25 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-09-24 02:27:35 -0400 |
commit | 64f1c11a477cb76e1572ee0793234739e045b3d5 (patch) | |
tree | 155d3420728d4c5411049e64dcf61c19a3f4210a /drivers/gpu/drm/nouveau/nouveau_drv.c | |
parent | 6f876986bedf23b40ab707543e88fae7eac27f1f (diff) |
drm/nouveau: restore perflvl on resume, and restore boot perflvl on unload
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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index b03bb6d5b987..f919e411e39a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include "nouveau_hw.h" | 31 | #include "nouveau_hw.h" |
32 | #include "nouveau_fb.h" | 32 | #include "nouveau_fb.h" |
33 | #include "nouveau_fbcon.h" | 33 | #include "nouveau_fbcon.h" |
34 | #include "nouveau_pm.h" | ||
34 | #include "nv50_display.h" | 35 | #include "nv50_display.h" |
35 | 36 | ||
36 | #include "drm_pciids.h" | 37 | #include "drm_pciids.h" |
@@ -279,6 +280,8 @@ nouveau_pci_resume(struct pci_dev *pdev) | |||
279 | if (ret) | 280 | if (ret) |
280 | return ret; | 281 | return ret; |
281 | 282 | ||
283 | nouveau_pm_resume(dev); | ||
284 | |||
282 | if (dev_priv->gart_info.type == NOUVEAU_GART_AGP) { | 285 | if (dev_priv->gart_info.type == NOUVEAU_GART_AGP) { |
283 | ret = nouveau_mem_init_agp(dev); | 286 | ret = nouveau_mem_init_agp(dev); |
284 | if (ret) { | 287 | if (ret) { |