Skip to content

Commit

Permalink
drm/i915: Stop kicking the signaling thread on seqno wraparound
Browse files Browse the repository at this point in the history
Since commit fd10e2c ("drm/i915/breadcrumbs: Ignore unsubmitted
signalers"), we cancel the signaler when retiring the request and so
upon wraparound, where we wait for all requests to be retired, we no
longer need to spin waiting for the signaling thread to release its
references to the in-flight requests, and so we can assert that the
signaler is idle.

References: fd10e2c ("drm/i915/breadcrumbs: Ignore unsubmitted signalers")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180306130143.13312-1-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Mar 6, 2018
1 parent 9792e21 commit 93eef7d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 2 additions & 0 deletions drivers/gpu/drm/i915/i915_request.c
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,8 @@ static int reset_all_global_seqno(struct drm_i915_private *i915, u32 seqno)
/* spin until threads are complete */
while (intel_breadcrumbs_busy(engine))
cond_resched();

GEM_BUG_ON(!list_empty(&engine->breadcrumbs.signals));
}

/* Check we are idle before we fiddle with hw state! */
Expand Down
5 changes: 0 additions & 5 deletions drivers/gpu/drm/i915/intel_breadcrumbs.c
Original file line number Diff line number Diff line change
Expand Up @@ -889,11 +889,6 @@ bool intel_breadcrumbs_busy(struct intel_engine_cs *engine)
spin_unlock_irq(&b->irq_lock);
}

if (!busy && !list_empty(&b->signals)) {
wake_up_process(b->signaler);
busy = true;
}

return busy;
}

Expand Down

0 comments on commit 93eef7d

Please sign in to comment.