On Mon, Apr 8, 2019 at 7:31 PM Sebastian Andrzej Siewior <bigeasy@xxxxxxxxxxxxx> wrote: > > On 2019-03-29 09:38:33 [+0100], Bernhard Landauer wrote: > > > > > How do I reproduce this? > > > > For me this happens reliably when I launch a fresh instance of ff and it > > automatically tries to restore tabs of the previous session. > > Alternatively, when I select 'Restore Previous Session' from the menu. > > Does this help? >From an uninvolved lurker, how is this supposed to change a thing? Moreover, I'd say the original version is better readable. --nX > diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c > index ca95ab2f4cfa3..8744d20ac1681 100644 > --- a/drivers/gpu/drm/i915/i915_request.c > +++ b/drivers/gpu/drm/i915/i915_request.c > @@ -278,9 +278,7 @@ static void __retire_engine_request(struct intel_engine_cs *engine, > > GEM_BUG_ON(!i915_request_completed(rq)); > > - local_irq_disable(); > - > - spin_lock(&engine->timeline.lock); > + spin_lock_irq(&engine->timeline.lock); > GEM_BUG_ON(!list_is_first(&rq->link, &engine->timeline.requests)); > list_del_init(&rq->link); > spin_unlock(&engine->timeline.lock); > @@ -294,9 +292,7 @@ static void __retire_engine_request(struct intel_engine_cs *engine, > GEM_BUG_ON(!atomic_read(&rq->i915->gt_pm.rps.num_waiters)); > atomic_dec(&rq->i915->gt_pm.rps.num_waiters); > } > - spin_unlock(&rq->lock); > - > - local_irq_enable(); > + spin_unlock_irq(&rq->lock); > > /* > * The backing object for the context is done after switching to the > > Sebastian
