Skip to content

Commit

Permalink
drm/nouveau: disable output polling through suspend.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Maxim Levitsky authored and Ben Skeggs committed Dec 21, 2011
1 parent c983e6f commit 4bfb94a
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/nouveau/nouveau_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 4bfb94a

Please sign in to comment.