diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2017-02-07 12:49:56 +0000 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-02-08 16:15:42 +0100 |
| commit | 24f76b2c87ed68f79f9f0705b11ccbefaaa0d390 (patch) | |
| tree | d21dd8b97b20875f2a8b4d73abd80d7ebbf2ecb3 /drivers/gpu/drm/drm_fb_helper.c | |
| parent | f21b9a92ca7c29382909eaab9facc2cf46f2cc0b (diff) | |
| download | linux-stable-24f76b2c87ed68f79f9f0705b11ccbefaaa0d390.tar.gz linux-stable-24f76b2c87ed68f79f9f0705b11ccbefaaa0d390.tar.bz2 linux-stable-24f76b2c87ed68f79f9f0705b11ccbefaaa0d390.zip | |
drm: Cancel drm_fb_helper_resume_work on unload
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 <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
Diffstat (limited to 'drivers/gpu/drm/drm_fb_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 7f5f936c8697..f6d4d9700734 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -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); |