drm/i915/selftests: Return to kernel context after each test

As we flush each test and wait for idle before the next, also switch
back to the kernel context. This helps limit the amount of collateral
damage a test may cause by resetting to the default state each time (and
also helps clean up temporaries used by the test).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180508115312.12628-1-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2018-05-08 12:53:12 +01:00
parent aaefa06a0e
commit 4cdf65ce8c

View File

@ -57,6 +57,11 @@ int igt_flush_test(struct drm_i915_private *i915, unsigned int flags)
cond_resched(); cond_resched();
if (i915_gem_switch_to_kernel_context(i915)) {
pr_err("Failed to switch back to kernel context; declaring wedged\n");
i915_gem_set_wedged(i915);
}
wedge_on_timeout(&w, i915, HZ) wedge_on_timeout(&w, i915, HZ)
i915_gem_wait_for_idle(i915, flags); i915_gem_wait_for_idle(i915, flags);