diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2020-02-27 08:57:11 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2020-02-28 09:25:41 +0000 |
| commit | 950da30162186177b96fbcfe79b788f955a1329c (patch) | |
| tree | b2073540111291c72a058105adbe631a7443f1b8 /drivers/gpu/drm/i915/selftests | |
| parent | drm/i915: Skip barriers inside waits (diff) | |
| download | linux-dev-950da30162186177b96fbcfe79b788f955a1329c.tar.xz linux-dev-950da30162186177b96fbcfe79b788f955a1329c.zip | |
drm/i915/selftests: Disable heartbeat around manual pulse tests
Still chasing the mystery of the stray idle flush, let's ensure that the
heartbeat does not run at the same time as our test and confuse us.
References: https://gitlab.freedesktop.org/drm/intel/issues/541
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Andi Shyti <andi.shyti@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200227085723.1961649-8-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/selftests')
| -rw-r--r-- | drivers/gpu/drm/i915/selftests/i915_active.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/selftests/i915_active.c b/drivers/gpu/drm/i915/selftests/i915_active.c index 067e30b8927f..3a37c67ab6c4 100644 --- a/drivers/gpu/drm/i915/selftests/i915_active.c +++ b/drivers/gpu/drm/i915/selftests/i915_active.c @@ -331,8 +331,7 @@ void i915_active_unlock_wait(struct i915_active *ref) } /* And wait for the retire callback */ - spin_lock_irq(&ref->tree_lock); - spin_unlock_irq(&ref->tree_lock); + spin_unlock_wait(&ref->tree_lock); /* ... which may have been on a thread instead */ flush_work(&ref->work); |