Skip to content

Commit

Permalink
drm/i915/gt: Cancel banned contexts after GT reset
Browse files Browse the repository at this point in the history
As we started marking the ce->gem_context as NULL on closure, we can no
longer use that to carry closure information. Instead, we can look at
whether the context was killed on closure instead.

Fixes: 130a95e ("drm/i915/gem: Consolidate ctx->engines[] release")
Closes: https://gitlab.freedesktop.org/drm/intel/issues/1379
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200304165113.2449213-1-chris@chris-wilson.co.uk
  • Loading branch information
Chris Wilson committed Mar 4, 2020

Unverified

No user is associated with the committer email.
1 parent 8f1e574 commit be90e34
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/gpu/drm/i915/gt/intel_reset.c
Original file line number Diff line number Diff line change
@@ -94,13 +94,7 @@ static bool mark_guilty(struct i915_request *rq)
ctx = NULL;
rcu_read_unlock();
if (!ctx)
return false;

if (i915_gem_context_is_closed(ctx)) {
intel_context_set_banned(rq->context);
banned = true;
goto out;
}
return intel_context_is_banned(rq->context);

atomic_inc(&ctx->guilty_count);

0 comments on commit be90e34

Please sign in to comment.