summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMaxim Levitsky <maximlevitsky@gmail.com>2011-10-09 22:58:33 +0200
committerBen Skeggs <bskeggs@redhat.com>2011-12-21 19:01:17 +1000
commit4bfb94a1b40e694284df3ea7dfb66ce6252b6008 (patch)
tree1fb569ed3e7d4bab96ccddb200f94eb37c50fd00 /drivers
parentc983e6f660dd39758b032a2de4c8844ff2575278 (diff)
drm/nouveau: disable output polling through suspend.
Because doing polling while hardware is disabled is a bad idea... Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
-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 f0a60afac44..982505b1be5 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.c
@@ -178,6 +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 fbcon acceleration...\n");
nouveau_fbcon_save_disable_accel(dev);
@@ -385,6 +387,7 @@ nouveau_pci_resume(struct pci_dev *pdev)
drm_helper_resume_force_mode(dev);
nouveau_fbcon_restore_accel(dev);
+ drm_kms_helper_poll_enable(dev);
return 0;
}