summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/nouveau_drv.c
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2011-11-09 09:18:47 +0400
committerBen Skeggs <bskeggs@redhat.com>2011-12-21 13:01:35 +0400
commitf62b27db6b5479efe376b408802a081a834ef50e (patch)
treecb8a21800e7996f58e2e68027228bc3c071572f1 /drivers/gpu/drm/nouveau/nouveau_drv.c
parent1772fcc6f8af681a6e08f5cca15e86e710efe809 (diff)
downloadlinux-f62b27db6b5479efe376b408802a081a834ef50e.tar.xz
drm/nouveau: shutdown display on suspend/hibernate
Known to fix some serious issues with hibernate on a couple of systems. 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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c
index cb357ab3670c..e4485404892e 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -178,7 +178,8 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state)
if (dev->switch_power_state == DRM_SWITCH_POWER_OFF)
return 0;
- drm_kms_helper_poll_disable(dev);
+ NV_INFO(dev, "Disabling display...\n");
+ nouveau_display_fini(dev);
NV_INFO(dev, "Disabling fbcon...\n");
nouveau_fbcon_set_suspend(dev, 1);
@@ -357,8 +358,7 @@ nouveau_pci_resume(struct pci_dev *pdev)
nouveau_fbcon_set_suspend(dev, 0);
nouveau_fbcon_zfill_all(dev);
- engine->display.init(dev);
- drm_kms_helper_poll_enable(dev);
+ nouveau_display_init(dev);
/* Force CLUT to get re-loaded during modeset */
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {