diff options
| author | Chris Wilson <[email protected]> | 2023-03-31 16:16:36 +0200 |
|---|---|---|
| committer | Andrzej Hajda <[email protected]> | 2023-04-05 12:27:03 +0200 |
| commit | aa7b93eb94ad6d883016bffda670e028fe168051 (patch) | |
| tree | bf3cb4805a9c02d6d605601c6684bcde6a12d203 /drivers/gpu/drm/i915/gt/intel_engine_pm.c | |
| parent | a915450e0e44e9ed2a87fc5b3208d5ce01554a8a (diff) | |
drm/i915/gt: Hold a wakeref for the active VM
There may be a disconnect between the GT used by the engine and the GT
used for the VM, requiring us to hold a wakeref on both while the GPU is
active with this request.
v2: added explanation to __queue_and_release_pm
Signed-off-by: Chris Wilson <[email protected]>
[ahajda: removed not-yet-upstremed wakeref tracking bits]
Signed-off-by: Andrzej Hajda <[email protected]>
Reviewed-by: Tvrtko Ursulin <[email protected]>
Reviewed-by: Andi Shyti <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_engine_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_engine_pm.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.c b/drivers/gpu/drm/i915/gt/intel_engine_pm.c index e971b153fda9..ee531a5c142c 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_pm.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.c @@ -115,6 +115,15 @@ __queue_and_release_pm(struct i915_request *rq, ENGINE_TRACE(engine, "parking\n"); /* + * Open coded one half of intel_context_enter, which we have to omit + * here (see the large comment below) and because the other part must + * not be called due constructing directly with __i915_request_create + * which increments active count via intel_context_mark_active. + */ + GEM_BUG_ON(rq->context->active_count != 1); + __intel_gt_pm_get(engine->gt); + + /* * We have to serialise all potential retirement paths with our * submission, as we don't want to underflow either the * engine->wakeref.counter or our timeline->active_count. |