Skip to content

Commit

Permalink
drm: Cancel drm_fb_helper_resume_work on unload
Browse files Browse the repository at this point in the history
We can not allow the worker to run after its fbdev, or even the module,
has been removed.

Fixes: cfe6342 ("drm/fb-helper: Add drm_fb_helper_set_suspend_unlocked()")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v4.9+
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170207124956.14954-2-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson authored and Daniel Vetter committed Feb 8, 2017
1 parent f21b9a9 commit 24f76b2
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions drivers/gpu/drm/drm_fb_helper.c
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,7 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper)
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);
Expand Down

0 comments on commit 24f76b2

Please sign in to comment.