Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd12c6ca authored by Chris Wilson's avatar Chris Wilson
Browse files

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: default avatarZhao Yakui <yakui.zhao@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180625100604.22598-1-chris@chris-wilson.co.uk
parent 8d52e447

drivers/gpu/drm/i915/intel_lrc.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

}