Commit b9777c6f authored by Chris Wilson's avatar Chris Wilson

drm/i915/selftests: Only switch to kernel context when locked

In igt_flush_test() we try to switch back to the kernel context, but we
are only able to do so when we are called with struct_mutex held.

More of my CI fallout from lockdep being temporarily suppressed :(

Fixes: 4cdf65ce ("drm/i915/selftests: Return to kernel context after each test")
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180509065926.19207-1-chris@chris-wilson.co.uk
parent 1d7a99f5
...@@ -57,7 +57,8 @@ int igt_flush_test(struct drm_i915_private *i915, unsigned int flags) ...@@ -57,7 +57,8 @@ int igt_flush_test(struct drm_i915_private *i915, unsigned int flags)
cond_resched(); cond_resched();
if (i915_gem_switch_to_kernel_context(i915)) { if (flags & I915_WAIT_LOCKED &&
i915_gem_switch_to_kernel_context(i915)) {
pr_err("Failed to switch back to kernel context; declaring wedged\n"); pr_err("Failed to switch back to kernel context; declaring wedged\n");
i915_gem_set_wedged(i915); i915_gem_set_wedged(i915);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment