diff options
author | Lyude Paul <lyude@redhat.com> | 2018-08-08 00:32:48 +0300 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2018-09-06 23:54:27 +0300 |
commit | 2f7ca781fd382cf8dde73ed36dfdd93fd05b3332 (patch) | |
tree | 782a963981c48fddd575cb89c961793617814565 /drivers/gpu/drm/nouveau/nouveau_drm.c | |
parent | 79e765ad665da4b8aa7e9c878bd2fef837f6fea5 (diff) | |
download | linux-2f7ca781fd382cf8dde73ed36dfdd93fd05b3332.tar.xz |
drm/nouveau/drm/nouveau: Don't forget to cancel hpd_work on suspend/unload
Currently, there's nothing in nouveau that actually cancels this work
struct. So, cancel it on suspend/unload. Otherwise, if we're unlucky
enough hpd_work might try to keep running up until the system is
suspended.
Signed-off-by: Lyude Paul <lyude@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 04f704b77a3c..f1a119113d04 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -627,7 +627,7 @@ nouveau_drm_unload(struct drm_device *dev) nouveau_debugfs_fini(drm); if (dev->mode_config.num_crtc) - nouveau_display_fini(dev, false); + nouveau_display_fini(dev, false, false); nouveau_display_destroy(dev); nouveau_bios_takedown(dev); |