GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-05-04 14:23:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/i915/selftests: Synchronize checking active status with retirement

Browse source 
If retirement is running on another thread, we may inspect the status of
the i915_active before its retirement callback is complete. As we expect
it to be running synchronously, we can wait for any callback to complete
by acquiring the i915_active.mutex.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Andi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191022112111.9317-1-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2019-10-22 12:21:11 +01:00
parent 905da43c6a
commit f79520bb33
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/gpu/drm/i915/gt/selftest_engine_heartbeat.c
View file

@ -49,12 +49,20 @@ static struct pulse *pulse_create(void)
return p; return p;
} }
static void pulse_unlock_wait(struct pulse *p)
{
mutex_lock(&p->active.mutex);
mutex_unlock(&p->active.mutex);
}
static int __live_idle_pulse(struct intel_engine_cs *engine, static int __live_idle_pulse(struct intel_engine_cs *engine,
int (*fn)(struct intel_engine_cs *cs)) int (*fn)(struct intel_engine_cs *cs))
{ {
struct pulse *p; struct pulse *p;
int err; int err;
GEM_BUG_ON(!intel_engine_pm_is_awake(engine));
p = pulse_create(); p = pulse_create();
if (!p) if (!p)
return -ENOMEM; return -ENOMEM;
@ -73,16 +81,21 @@ static int __live_idle_pulse(struct intel_engine_cs *engine,
i915_active_release(&p->active); i915_active_release(&p->active);
GEM_BUG_ON(i915_active_is_idle(&p->active)); GEM_BUG_ON(i915_active_is_idle(&p->active));
GEM_BUG_ON(llist_empty(&engine->barrier_tasks));
err = fn(engine); err = fn(engine);
if (err) if (err)
goto out; goto out;
GEM_BUG_ON(!llist_empty(&engine->barrier_tasks));
if (intel_gt_retire_requests_timeout(engine->gt, HZ / 5)) { if (intel_gt_retire_requests_timeout(engine->gt, HZ / 5)) {
err = -ETIME; err = -ETIME;
goto out; goto out;
} }
pulse_unlock_wait(p); /* synchronize with the retirement callback */
if (!i915_active_is_idle(&p->active)) { if (!i915_active_is_idle(&p->active)) {
pr_err("%s: heartbeat pulse did not flush idle tasks\n", pr_err("%s: heartbeat pulse did not flush idle tasks\n",
engine->name); engine->name);