commit a0b7f16e23be5f77b12166291181e08310f0398e Author: Maxim Levitsky Date: Sat Oct 8 14:50:24 2011 +0200 nouveau: disable output polling through suspend. Because doing polling while hardware is disabled is a bad idea... Signed-off-by: Maxim Levitsky diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index dabcdf0..de41cab 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c @@ -183,6 +183,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); @@ -390,6 +392,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; }