niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/i915/selftests: Teach switch_to_context() to use the context

Browse source 
The context details which engines to use, so use the ctx->engines[] to
generate the requests to cause the context switch.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191022130221.20644-2-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2019-10-22 14:02:21 +01:00
parent ae2e28b026
commit c31c9e82ee
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/gpu/drm/i915/selftests/i915_gem.c
View file

@ -15,16 +15,15 @@
#include "igt_flush_test.h" #include "igt_flush_test.h"
#include "mock_drm.h" #include "mock_drm.h"
static int switch_to_context(struct drm_i915_private *i915, static int switch_to_context(struct i915_gem_context *ctx)
struct i915_gem_context *ctx)
{ {
struct intel_engine_cs *engine; struct i915_gem_engines_iter it;
enum intel_engine_id id; struct intel_context *ce;
for_each_engine(engine, i915, id) { for_each_gem_engine(ce, i915_gem_context_lock_engines(ctx), it) {
struct i915_request *rq; struct i915_request *rq;
rq = igt_request_alloc(ctx, engine); rq = intel_context_create_request(ce);
if (IS_ERR(rq)) if (IS_ERR(rq))
return PTR_ERR(rq); return PTR_ERR(rq);
@ -140,7 +139,7 @@ static int igt_gem_suspend(void *arg)
err = -ENOMEM; err = -ENOMEM;
ctx = live_context(i915, file); ctx = live_context(i915, file);
if (!IS_ERR(ctx)) if (!IS_ERR(ctx))
err = switch_to_context(i915, ctx); err = switch_to_context(ctx);
if (err) if (err)
goto out; goto out;
@ -155,7 +154,7 @@ static int igt_gem_suspend(void *arg)
pm_resume(i915); pm_resume(i915);
err = switch_to_context(i915, ctx); err = switch_to_context(ctx);
out: out:
mock_file_free(i915, file); mock_file_free(i915, file);
return err; return err;
@ -175,7 +174,7 @@ static int igt_gem_hibernate(void *arg)
err = -ENOMEM; err = -ENOMEM;
ctx = live_context(i915, file); ctx = live_context(i915, file);
if (!IS_ERR(ctx)) if (!IS_ERR(ctx))
err = switch_to_context(i915, ctx); err = switch_to_context(ctx);
if (err) if (err)
goto out; goto out;
@ -190,7 +189,7 @@ static int igt_gem_hibernate(void *arg)
pm_resume(i915); pm_resume(i915);
err = switch_to_context(i915, ctx); err = switch_to_context(ctx);
out: out:
mock_file_free(i915, file); mock_file_free(i915, file);
return err; return err;