Commit 512eadb3 authored by Nitin Gote's avatar Nitin Gote Committed by Andi Shyti
Browse files

drm/i915/gt: Increase a time to retry RING_HEAD reset 

Issue seen again where engine resets fails because the engine resumes from
an incorrect RING_HEAD. HEAD is still not 0 even after writing into it.
This seems to be timing issue and we experimented different values from 5ms
to 50ms and found out that 50ms works best based on testing.
So, if write doesn't succeed at first then retry again.

v2: add a comment (Andi Shyti)

Closes: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12806


Signed-off-by: default avatarNitin Gote <nitin.r.gote@intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241217063532.2729031-1-nitin.r.gote@intel.com
parent f373ebec

drivers/gpu/drm/i915/gt/intel_ring_submission.c

+7 −2
Original line number Diff line number Diff line
@@ -230,8 +230,13 @@ static int xcs_resume(struct intel_engine_cs *engine) 


	set_pp_dir(engine);



	/* First wake the ring up to an empty/idle ring */

	for ((kt) = ktime_get() + (2 * NSEC_PER_MSEC);

	/*

	 * First wake the ring up to an empty/idle ring.

	 * Use 50ms of delay to let the engine write successfully

	 * for all platforms. Experimented with different values and

	 * determined that 50ms works best based on testing.

	 */

	for ((kt) = ktime_get() + (50 * NSEC_PER_MSEC);

			ktime_before(ktime_get(), (kt)); cpu_relax()) {

		/*

		 * In case of resets fails because engine resumes from