Commit 611ce855 authored Aug 15, 2018 by Lyude Paul Committed by Ben Skeggs Sep 07, 2018

drm/nouveau: Remove duplicate poll_enable() in pmops_runtime_suspend()



Since actual hotplug notifications don't get disabled until
nouveau_display_fini() is called, all this will do is cause any hotplugs
that happen between this drm_kms_helper_poll_disable() call and the
actual hotplug disablement to potentially be dropped if ACPI isn't
around to help us.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Acked-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Cc: stable@vger.kernel.org
Cc: Lukas Wunner <lukas@wunner.de>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

parent d77ef138

drivers/gpu/drm/nouveau/nouveau_drm.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -835,7 +835,6 @@ nouveau_pmops_runtime_suspend(struct device *dev)
		return -EBUSY;
		}

		drm_kms_helper_poll_disable(drm_dev);
		nouveau_switcheroo_optimus_dsm();
		ret = nouveau_do_suspend(drm_dev, true);
		pci_save_state(pdev);

Admin message