drm/i915/selftests: Make unbannable contexts for reset handling
igt_ctx_sseu was caught using bannable contexts, and in the course of resetting rapidly to run its test, was banned. Don't let ourselves ban the test! Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Mika Kuoppala <mika.kuoppala@linux.intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190218145051.18981-1-chris@chris-wilson.co.uk
This commit is contained in:
@@ -967,6 +967,7 @@ __igt_ctx_sseu(struct drm_i915_private *i915,
|
||||
ret = PTR_ERR(ctx);
|
||||
goto out_unlock;
|
||||
}
|
||||
i915_gem_context_clear_bannable(ctx); /* to reset and beyond! */
|
||||
|
||||
obj = i915_gem_object_create_internal(i915, PAGE_SIZE);
|
||||
if (IS_ERR(obj)) {
|
||||
|
||||
@@ -56,6 +56,8 @@ static int hang_init(struct hang *h, struct drm_i915_private *i915)
|
||||
if (IS_ERR(h->ctx))
|
||||
return PTR_ERR(h->ctx);
|
||||
|
||||
GEM_BUG_ON(i915_gem_context_is_bannable(h->ctx));
|
||||
|
||||
h->hws = i915_gem_object_create_internal(i915, PAGE_SIZE);
|
||||
if (IS_ERR(h->hws)) {
|
||||
err = PTR_ERR(h->hws);
|
||||
|
||||
@@ -236,6 +236,8 @@ switch_to_scratch_context(struct intel_engine_cs *engine,
|
||||
if (IS_ERR(ctx))
|
||||
return PTR_ERR(ctx);
|
||||
|
||||
GEM_BUG_ON(i915_gem_context_is_bannable(ctx));
|
||||
|
||||
rq = ERR_PTR(-ENODEV);
|
||||
with_intel_runtime_pm(engine->i915, wakeref)
|
||||
rq = igt_spinner_create_request(spin, ctx, engine, MI_NOOP);
|
||||
|
||||
Reference in New Issue
Block a user