Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9edc456f authored by Chris Wilson's avatar Chris Wilson Committed by Greg Kroah-Hartman
Browse files

drm: Cancel drm_fb_helper_dirty_work on unload 



commit f21b9a92ca7c29382909eaab9facc2cf46f2cc0b upstream.

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

Fixes: eaa434de ("drm/fb-helper: Add fb_deferred_io support")
Signed-off-by: default avatarChris 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
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170207124956.14954-1-chris@chris-wilson.co.uk


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 868a747c

drivers/gpu/drm/drm_fb_helper.c

+2 −0
Original line number Diff line number Diff line
@@ -848,6 +848,8 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper) 
	if (!drm_fbdev_emulation)

		return;



	cancel_work_sync(&fb_helper->dirty_work);



	if (!list_empty(&fb_helper->kernel_fb_list)) {

		list_del(&fb_helper->kernel_fb_list);

		if (list_empty(&kernel_fb_helper_list)) {