drm/nouveau: disable output polling through suspend.
authorMaxim Levitsky <maximlevitsky@gmail.com>
Sun, 9 Oct 2011 20:58:33 +0000 (22:58 +0200)
committerBen Skeggs <bskeggs@redhat.com>
Wed, 21 Dec 2011 09:01:17 +0000 (19:01 +1000)
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>
drivers/gpu/drm/nouveau/nouveau_drv.c

index f0a60afac446664422d5486d6379b4b5357880d0..982505b1be589c39b8c15b5d78c6b0d164782d41 100644 (file)
@@ -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;
 }