diff options
| author | Chris Wilson | 2018-06-25 12:06:03 +0200 |
|---|---|---|
| committer | Chris Wilson | 2018-06-25 17:28:23 +0200 |
| commit | dd12c6ca5b45fd54e80c1424b11a5a25ad913dbb (patch) | |
| tree | e3d85b415b8b610f5272ce6c8c53c2bad5eb289d /drivers/gpu/drm/i915/intel_lrc.c | |
| parent | drm/i915: Defer modeset cleanup to a secondary task (diff) | |
| download | kernel-qcow2-linux-dd12c6ca5b45fd54e80c1424b11a5a25ad913dbb.tar.gz kernel-qcow2-linux-dd12c6ca5b45fd54e80c1424b11a5a25ad913dbb.tar.xz kernel-qcow2-linux-dd12c6ca5b45fd54e80c1424b11a5a25ad913dbb.zip | |
drm/i915/execlists: Check for ce->state before destroy
As we may cancel the ce->state allocation during context pinning (but
crucially after we mark ce as operational), that means we may be asked
to destroy a nonexistent ce->state. Given the choice in handing a
complex error path on pinning, and just ignoring the lack of state in
destroy, choice the latter for simplicity.
Reported-by: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180625100604.22598-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lrc.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_lrc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index 10deebe49543..8f020537a34b 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1338,9 +1338,11 @@ static void execlists_schedule(struct i915_request *request, static void execlists_context_destroy(struct intel_context *ce) { - GEM_BUG_ON(!ce->state); GEM_BUG_ON(ce->pin_count); + if (!ce->state) + return; + intel_ring_free(ce->ring); __i915_gem_object_release_unless_active(ce->state->obj); } |