On Thu, Jul 14, 2016 at 01:47:49PM +0300, Mika Kuoppala wrote: > Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> writes: > > > 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: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> > > Cc: Daniel Vetter <daniel.vetter@xxxxxxxx> > > Cc: Mika Kuoppala <mika.kuoppala@xxxxxxxxx> > > Reviewed-by: Mika Kuoppala <mika.kuoppala@xxxxxxxxx> Cc: stable@xxxxxxxxxxxxxxx I presume? Checking for this should be part of the review ... -Daniel > > > --- > > drivers/gpu/drm/i915/intel_fbdev.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c > > index 86b00c6db1a6..ef17d88a1bc7 100644 > > --- a/drivers/gpu/drm/i915/intel_fbdev.c > > +++ b/drivers/gpu/drm/i915/intel_fbdev.c > > @@ -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); > > > > -- > > 2.8.1 -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
