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

drm/i915/guc: Reset LRC descriptor if register returns -ENODEV 



Reset LRC descriptor if a context register returns -ENODEV as this means
we are mid-reset.

Fixes: eb5e7da7 ("drm/i915/guc: Reset implementation for new GuC interface")
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-15-matthew.brost@intel.com
parent f16d5cb9

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

+4 −2
Original line number Diff line number Diff line
@@ -1405,11 +1405,13 @@ static int guc_lrc_desc_pin(struct intel_context *ce, bool loop) 
	} else {

		with_intel_runtime_pm(runtime_pm, wakeref)

			ret = register_context(ce, loop);

		if (unlikely(ret == -EBUSY))

		if (unlikely(ret == -EBUSY)) {

			reset_lrc_desc(guc, desc_idx);

		} else if (unlikely(ret == -ENODEV)) {

			reset_lrc_desc(guc, desc_idx);

		else if (unlikely(ret == -ENODEV))

			ret = 0;	/* Will get registered later */

		}

	}



	return ret;

}