[4.10,62/75] drm: Cancel drm_fb_helper_resume_work on unload

Commit Message

Greg Kroah-Hartman March 13, 2017, 8:44 a.m. UTC

4.10-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Chris Wilson <[e-mail]>

commit 24f76b2c87ed68f79f9f0705b11ccbefaaa0d390 upstream.

We can not allow the worker to run after its fbdev, or even the module,
has been removed.

Fixes: cfe63423d9be ("drm/fb-helper: Add drm_fb_helper_set_suspend_unlocked()")
Signed-off-by: Chris Wilson <[e-mail]>
Cc: Noralf Trønnes <[e-mail]>
Cc: Daniel Vetter <[e-mail]>
Cc: Jani Nikula <[e-mail]>
Cc: Sean Paul <[e-mail]>
Cc: [e-mail]
Signed-off-by: Daniel Vetter <[e-mail]>
Link: http://patchwork.freedesktop.org/patch/msgid/[e-mail]
Signed-off-by: Greg Kroah-Hartman <[e-mail]>

---
 drivers/gpu/drm/drm_fb_helper.c |    1 +
 1 file changed, 1 insertion(+)

Patch

--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -856,6 +856,7 @@  void drm_fb_helper_fini(struct drm_fb_he
 	if (!drm_fbdev_emulation)
 		return;
 
+	cancel_work_sync(&fb_helper->resume_work);
 	cancel_work_sync(&fb_helper->dirty_work);
 
 	mutex_lock(&kernel_fb_helper_lock);