]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/nouveau: Remove useless poll_enable() call in switcheroo_set_state()
authorLyude Paul <lyude@redhat.com>
Wed, 15 Aug 2018 19:15:11 +0000 (15:15 -0400)
committerBen Skeggs <bskeggs@redhat.com>
Thu, 6 Sep 2018 20:54:26 +0000 (06:54 +1000)
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>
drivers/gpu/drm/nouveau/nouveau_vga.c

index 3da5a4305aa4847a32c0abf398a50e7a0dc90b7e..09b1d8151881ac4436fe6a44258bc992de41089d 100644 (file)
@@ -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");