Commit 57f62622 authored by Chris Wilson's avatar Chris Wilson

drm/i915/selftests: Remove redundant live_context for eviction

We just need the context image from the logical state to force eviction
of many contexts, so simplify by avoiding the GEM context container.
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201223154509.14155-1-chris@chris-wilson.co.uk
parent 5be071e9
...@@ -442,28 +442,22 @@ static int igt_evict_contexts(void *arg) ...@@ -442,28 +442,22 @@ static int igt_evict_contexts(void *arg)
/* Overfill the GGTT with context objects and so try to evict one. */ /* Overfill the GGTT with context objects and so try to evict one. */
for_each_engine(engine, gt, id) { for_each_engine(engine, gt, id) {
struct i915_sw_fence fence; struct i915_sw_fence fence;
struct file *file;
file = mock_file(i915);
if (IS_ERR(file)) {
err = PTR_ERR(file);
break;
}
count = 0; count = 0;
onstack_fence_init(&fence); onstack_fence_init(&fence);
do { do {
struct intel_context *ce;
struct i915_request *rq; struct i915_request *rq;
struct i915_gem_context *ctx;
ctx = live_context(i915, file); ce = intel_context_create(engine);
if (IS_ERR(ctx)) if (IS_ERR(ce))
break; break;
/* We will need some GGTT space for the rq's context */ /* We will need some GGTT space for the rq's context */
igt_evict_ctl.fail_if_busy = true; igt_evict_ctl.fail_if_busy = true;
rq = igt_request_alloc(ctx, engine); rq = intel_context_create_request(ce);
igt_evict_ctl.fail_if_busy = false; igt_evict_ctl.fail_if_busy = false;
intel_context_put(ce);
if (IS_ERR(rq)) { if (IS_ERR(rq)) {
/* When full, fail_if_busy will trigger EBUSY */ /* When full, fail_if_busy will trigger EBUSY */
...@@ -490,8 +484,6 @@ static int igt_evict_contexts(void *arg) ...@@ -490,8 +484,6 @@ static int igt_evict_contexts(void *arg)
onstack_fence_fini(&fence); onstack_fence_fini(&fence);
pr_info("Submitted %lu contexts/requests on %s\n", pr_info("Submitted %lu contexts/requests on %s\n",
count, engine->name); count, engine->name);
fput(file);
if (err) if (err)
break; break;
} }
......
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