diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-06-01 03:09:06 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-06-01 04:36:02 +0400 |
| commit | fbf81762e385d3d45acad057b654d56972acf58c (patch) | |
| tree | bc1b9e31e92ca702ea808650fda45443145f6776 /drivers/gpu/drm/nouveau | |
| parent | fc5ea29d72bde1bec230538becf396caad8621b8 (diff) | |
| download | linux-fbf81762e385d3d45acad057b654d56972acf58c.tar.xz | |
drm/kms: disable/enable poll around switcheroo on/off
Because we aren't in a suspend state the poll will still run when we have switcherooed a card off.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_state.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index e632339c323e..5c468a4fef9a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c @@ -376,12 +376,15 @@ out_err: static void nouveau_switcheroo_set_state(struct pci_dev *pdev, enum vga_switcheroo_state state) { + struct drm_device *dev = pci_get_drvdata(pdev); pm_message_t pmm = { .event = PM_EVENT_SUSPEND }; if (state == VGA_SWITCHEROO_ON) { printk(KERN_ERR "VGA switcheroo: switched nouveau on\n"); nouveau_pci_resume(pdev); + drm_kms_helper_poll_enable(dev); } else { printk(KERN_ERR "VGA switcheroo: switched nouveau off\n"); + drm_kms_helper_poll_disable(dev); nouveau_pci_suspend(pdev, pmm); } } |