diff options
| author | Lyude Paul | 2018-08-15 21:15:11 +0200 |
|---|---|---|
| committer | Ben Skeggs | 2018-09-06 22:54:26 +0200 |
| commit | 0445f7537d0742e4f8bcf594a8d81fb901fd131e (patch) | |
| tree | 17ee9a72dacaee9434f617915e7145f411f0f546 | |
| parent | drm/nouveau: Fix deadlocks in nouveau_connector_detect() (diff) | |
| download | kernel-qcow2-linux-0445f7537d0742e4f8bcf594a8d81fb901fd131e.tar.gz kernel-qcow2-linux-0445f7537d0742e4f8bcf594a8d81fb901fd131e.tar.xz kernel-qcow2-linux-0445f7537d0742e4f8bcf594a8d81fb901fd131e.zip | |
drm/nouveau: Remove useless poll_enable() call in switcheroo_set_state()
This doesn't do anything, drm_kms_helper_poll_enable() gets called in
nouveau_pmops_resume()->nouveau_display_resume()->nouveau_display_init()
already.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Cc: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_vga.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c index 3da5a4305aa4..09b1d8151881 100644 --- a/drivers/gpu/drm/nouveau/nouveau_vga.c +++ b/drivers/gpu/drm/nouveau/nouveau_vga.c @@ -46,7 +46,6 @@ nouveau_switcheroo_set_state(struct pci_dev *pdev, pr_err("VGA switcheroo: switched nouveau on\n"); dev->switch_power_state = DRM_SWITCH_POWER_CHANGING; nouveau_pmops_resume(&pdev->dev); - drm_kms_helper_poll_enable(dev); dev->switch_power_state = DRM_SWITCH_POWER_ON; } else { pr_err("VGA switcheroo: switched nouveau off\n"); |