diff options
| -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; } |