drm/i915/selftests: wait for active idle event in i915_active_unlock_wait

ahajda · ahajda · commit 34880b18733e · 2023-12-08T12:19:26.000+01:00
After i915_active_unlock_wait i915_active can be still non-idle due to barrier async handling in signal_irq_work. As a result one can observe following errors: bcs0: heartbeat pulse did not flush idle tasks *ERROR* pulse active pulse_active [i915]:pulse_retire [i915] *ERROR* pulse count: 0 *ERROR* pulse preallocated barriers? no To prevent it let's wait explicitly for idleness. v2: wait only in live_idle tests Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231205-selftest_wait_for_active_idle_event-v2-1-1437d0bf9829@intel.com
diff --git a/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c b/drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c
@@ -84,7 +84,7 @@ static struct pulse *pulse_create(void)
 
 static void pulse_unlock_wait(struct pulse *p)
 {
-	i915_active_unlock_wait(&p->active);
+	wait_var_event_timeout(&p->active, i915_active_is_idle(&p->active), HZ);
 }
 
 static int __live_idle_pulse(struct intel_engine_cs *engine,

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ static struct pulse *pulse_create(void)`
`84`	`84`
`85`	`85`	`static void pulse_unlock_wait(struct pulse *p)`
`86`	`86`	`{`
`87`		`- i915_active_unlock_wait(&p->active);`
	`87`	`+ wait_var_event_timeout(&p->active, i915_active_is_idle(&p->active), HZ);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`static int __live_idle_pulse(struct intel_engine_cs *engine,`