summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/nouveau/nouveau_drv.c
diff options
context:
space:
mode:
authorBen Skeggs2010-09-17 05:35:25 +0200
committerBen Skeggs2010-09-24 08:27:35 +0200
commit64f1c11a477cb76e1572ee0793234739e045b3d5 (patch)
tree155d3420728d4c5411049e64dcf61c19a3f4210a /drivers/gpu/drm/nouveau/nouveau_drv.c
parentdrm/nouveau: allow static performance level setting (diff)
downloadkernel-qcow2-linux-64f1c11a477cb76e1572ee0793234739e045b3d5.tar.gz
kernel-qcow2-linux-64f1c11a477cb76e1572ee0793234739e045b3d5.tar.xz
kernel-qcow2-linux-64f1c11a477cb76e1572ee0793234739e045b3d5.zip
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.c3
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 @@
#include "nouveau_hw.h"
#include "nouveau_fb.h"
#include "nouveau_fbcon.h"
+#include "nouveau_pm.h"
#include "nv50_display.h"
#include "drm_pciids.h"
@@ -279,6 +280,8 @@ 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) {