diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2019-11-25 10:58:56 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2019-11-25 13:17:18 +0000 |
| commit | de5825beae9a0ae51f14a92859c6ec916235cd4d (patch) | |
| tree | 1b3c488c44960edddf75b7b7823839b806e0be01 /drivers/gpu/drm/i915/selftests/i915_active.c | |
| parent | drm/i915/execlists: Fixup cancel_port_requests() (diff) | |
| download | linux-dev-de5825beae9a0ae51f14a92859c6ec916235cd4d.tar.xz linux-dev-de5825beae9a0ae51f14a92859c6ec916235cd4d.zip | |
drm/i915: Serialise with engine-pm around requests on the kernel_context
As the engine->kernel_context is used within the engine-pm barrier, we
have to be careful when emitting requests outside of the barrier, as the
strict timeline locking rules do not apply. Instead, we must ensure the
engine_park() cannot be entered as we build the request, which is
simplest by taking an explicit engine-pm wakeref around the request
construction.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191125105858.1718307-1-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/selftests/i915_active.c')
| -rw-r--r-- | drivers/gpu/drm/i915/selftests/i915_active.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/selftests/i915_active.c b/drivers/gpu/drm/i915/selftests/i915_active.c index 60290f78750d..6c1db3ded446 100644 --- a/drivers/gpu/drm/i915/selftests/i915_active.c +++ b/drivers/gpu/drm/i915/selftests/i915_active.c @@ -99,7 +99,7 @@ __live_active_setup(struct drm_i915_private *i915) for_each_uabi_engine(engine, i915) { struct i915_request *rq; - rq = i915_request_create(engine->kernel_context); + rq = intel_engine_create_kernel_request(engine); if (IS_ERR(rq)) { err = PTR_ERR(rq); break; |