diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2018-03-06 13:01:42 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2018-03-06 17:25:55 +0000 |
| commit | 93eef7d65329b62cf8a6db918fe5ca5d84eedf50 (patch) | |
| tree | d827bac0d434a9cb50dd39c6ce23b6cc45ba055b | |
| parent | 9792e213a4c9b16b814c0865ea0cc5d5125e052b (diff) | |
| download | linux-93eef7d65329b62cf8a6db918fe5ca5d84eedf50.tar.gz linux-93eef7d65329b62cf8a6db918fe5ca5d84eedf50.tar.xz | |
drm/i915: Stop kicking the signaling thread on seqno wraparound
Since commit fd10e2ce9905 ("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: fd10e2ce9905 ("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
| -rw-r--r-- | drivers/gpu/drm/i915/i915_request.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/intel_breadcrumbs.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c index 2265bb8ff4fa..d34a3e5800b7 100644 --- a/drivers/gpu/drm/i915/i915_request.c +++ b/drivers/gpu/drm/i915/i915_request.c @@ -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! */ diff --git a/drivers/gpu/drm/i915/intel_breadcrumbs.c b/drivers/gpu/drm/i915/intel_breadcrumbs.c index 6a740618863c..bab74c3ee81a 100644 --- a/drivers/gpu/drm/i915/intel_breadcrumbs.c +++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c @@ -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; } |