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

Commit 0b8c0e9c authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915/fbdev: Drain the suspend worker on retiring 



Since the suspend_work can arm itself if the console_lock() is currently
held elsewhere, simply calling flush_work() doesn't guarantee that the
work is idle upon return. To do so requires using cancel_work_sync().

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1468431285-28264-1-git-send-email-chris@chris-wilson.co.uk


Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
parent e7852a4b

drivers/gpu/drm/i915/intel_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -768,7 +768,7 @@ void intel_fbdev_fini(struct drm_device *dev) 
	if (!ifbdev)

		return;



	flush_work(&dev_priv->fbdev_suspend_work);

	cancel_work_sync(&dev_priv->fbdev_suspend_work);

	if (!current_is_async())

		intel_fbdev_sync(ifbdev);