Commit 422cda4f authored by Matthew Brost's avatar Matthew Brost Committed by John Harrison
Browse files

drm/i915/guc: Take context ref when cancelling request 



A context can get destroyed after cancelling a request, if a context or
GT reset occurs, so take a reference to context when cancelling a
request.

Fixes: 62eaf0ae ("drm/i915/guc: Support request cancellation")
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210909164744.31249-13-matthew.brost@intel.com
parent d2420c2e

drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c

+4 −1
Original line number Diff line number Diff line
@@ -1624,8 +1624,10 @@ static void guc_context_cancel_request(struct intel_context *ce, 
				       struct i915_request *rq)

{

	if (i915_sw_fence_signaled(&rq->submit)) {

		struct i915_sw_fence *fence = guc_context_block(ce);

		struct i915_sw_fence *fence;



		intel_context_get(ce);

		fence = guc_context_block(ce);

		i915_sw_fence_wait(fence);

		if (!i915_request_completed(rq)) {

			__i915_request_skip(rq);
@@ -1640,6 +1642,7 @@ static void guc_context_cancel_request(struct intel_context *ce, 
		flush_work(&ce_to_guc(ce)->ct.requests.worker);



		guc_context_unblock(ce);

		intel_context_put(ce);

	}

}