b9777c6f86
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: 4cdf65ce8cc2 ("drm/i915/selftests: Return to kernel context after each 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/20180509065926.19207-1-chris@chris-wilson.co.uk
71 lines
1.5 KiB
C
71 lines
1.5 KiB
C
/*
|
|
* SPDX-License-Identifier: MIT
|
|
*
|
|
* Copyright © 2018 Intel Corporation
|
|
*/
|
|
|
|
#include "../i915_drv.h"
|
|
|
|
#include "../i915_selftest.h"
|
|
#include "igt_flush_test.h"
|
|
|
|
struct wedge_me {
|
|
struct delayed_work work;
|
|
struct drm_i915_private *i915;
|
|
const void *symbol;
|
|
};
|
|
|
|
static void wedge_me(struct work_struct *work)
|
|
{
|
|
struct wedge_me *w = container_of(work, typeof(*w), work.work);
|
|
|
|
pr_err("%pS timed out, cancelling all further testing.\n", w->symbol);
|
|
|
|
GEM_TRACE("%pS timed out.\n", w->symbol);
|
|
GEM_TRACE_DUMP();
|
|
|
|
i915_gem_set_wedged(w->i915);
|
|
}
|
|
|
|
static void __init_wedge(struct wedge_me *w,
|
|
struct drm_i915_private *i915,
|
|
long timeout,
|
|
const void *symbol)
|
|
{
|
|
w->i915 = i915;
|
|
w->symbol = symbol;
|
|
|
|
INIT_DELAYED_WORK_ONSTACK(&w->work, wedge_me);
|
|
schedule_delayed_work(&w->work, timeout);
|
|
}
|
|
|
|
static void __fini_wedge(struct wedge_me *w)
|
|
{
|
|
cancel_delayed_work_sync(&w->work);
|
|
destroy_delayed_work_on_stack(&w->work);
|
|
w->i915 = NULL;
|
|
}
|
|
|
|
#define wedge_on_timeout(W, DEV, TIMEOUT) \
|
|
for (__init_wedge((W), (DEV), (TIMEOUT), __builtin_return_address(0)); \
|
|
(W)->i915; \
|
|
__fini_wedge((W)))
|
|
|
|
int igt_flush_test(struct drm_i915_private *i915, unsigned int flags)
|
|
{
|
|
struct wedge_me w;
|
|
|
|
cond_resched();
|
|
|
|
if (flags & I915_WAIT_LOCKED &&
|
|
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)
|
|
i915_gem_wait_for_idle(i915, flags);
|
|
|
|
return i915_terminally_wedged(&i915->gpu_error) ? -EIO : 0;
|
|
}
|