drm/nouveau: Rename acpi_work to hpd_work
authorHans de Goede <hdegoede@redhat.com>
Mon, 21 Nov 2016 16:50:54 +0000 (17:50 +0100)
committerRaspbian kernel package updater <root@raspbian.org>
Sun, 23 Jul 2017 02:58:36 +0000 (02:58 +0000)
commit899a2083c6e6d0035b9973e923eb84acbebcc7d5
treece8faf31b55a60f286fe00f5a8e42693dfc00272
parentd8134a16cfd18868c0eecb424d7d16371c5e5a68
drm/nouveau: Rename acpi_work to hpd_work

[ Upstream commit 81280d0e24e76c35f40f997af26c779bcb10b04d ]

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>
drivers/gpu/drm/nouveau/nouveau_display.c
drivers/gpu/drm/nouveau/nouveau_drv.h