drm/nouveau: Rename acpi_work to hpd_work

Browse source

[ Upstream commit 81280d0e24 ]

We need to call drm_helper_hpd_irq_event() on resume to properly detect
monitor connection / disconnection on some laptops. For runtime-resume
(which gets called on resume from normal suspend too) we must call
drm_helper_hpd_irq_event() from a workqueue to avoid a deadlock.

Rename acpi_work to hpd_work, and move it out of the #ifdef CONFIG_ACPI
blocks to make it suitable for generic work.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Hans de Goede 2016-11-21 17:50:54 +01:00 • committed by Greg Kroah-Hartman

parent ef66745a1b

commit d2beb1a9dd

2 changed files with 17 additions and 17 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

32

drivers/gpu/drm/nouveau/nouveau_display.c

View file

2

drivers/gpu/drm/nouveau/nouveau_drv.h

View file