From 93eef7d65329b62cf8a6db918fe5ca5d84eedf50 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 6 Mar 2018 13:01:42 +0000 Subject: [PATCH] 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 Cc: Joonas Lahtinen Reviewed-by: Joonas Lahtinen Link: https://patchwork.freedesktop.org/patch/msgid/20180306130143.13312-1-chris@chris-wilson.co.uk --- drivers/gpu/drm/i915/i915_request.c | 2 ++ 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 2265bb8..d34a3e5 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 6a74061..bab74c3 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; } -- 2.7.4