Skip to content

Commit aa7b93e

Browse files
ickleahajda
authored andcommitted
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 <chris@chris-wilson.co.uk> [ahajda: removed not-yet-upstremed wakeref tracking bits] Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com> Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230330-hold_wakeref_for_active_vm-v2-1-724d201499c2@intel.com
1 parent a915450 commit aa7b93e

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

drivers/gpu/drm/i915/gt/intel_context.h

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "i915_drv.h"
1515
#include "intel_context_types.h"
1616
#include "intel_engine_types.h"
17+
#include "intel_gt_pm.h"
1718
#include "intel_ring_types.h"
1819
#include "intel_timeline_types.h"
1920
#include "i915_trace.h"
@@ -207,8 +208,11 @@ void intel_context_exit_engine(struct intel_context *ce);
207208
static inline void intel_context_enter(struct intel_context *ce)
208209
{
209210
lockdep_assert_held(&ce->timeline->mutex);
210-
if (!ce->active_count++)
211-
ce->ops->enter(ce);
211+
if (ce->active_count++)
212+
return;
213+
214+
ce->ops->enter(ce);
215+
intel_gt_pm_get(ce->vm->gt);
212216
}
213217

214218
static inline void intel_context_mark_active(struct intel_context *ce)
@@ -222,8 +226,11 @@ static inline void intel_context_exit(struct intel_context *ce)
222226
{
223227
lockdep_assert_held(&ce->timeline->mutex);
224228
GEM_BUG_ON(!ce->active_count);
225-
if (!--ce->active_count)
226-
ce->ops->exit(ce);
229+
if (--ce->active_count)
230+
return;
231+
232+
intel_gt_pm_put_async(ce->vm->gt);
233+
ce->ops->exit(ce);
227234
}
228235

229236
static inline struct intel_context *intel_context_get(struct intel_context *ce)

drivers/gpu/drm/i915/gt/intel_engine_pm.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,15 @@ __queue_and_release_pm(struct i915_request *rq,
114114

115115
ENGINE_TRACE(engine, "parking\n");
116116

117+
/*
118+
* Open coded one half of intel_context_enter, which we have to omit
119+
* here (see the large comment below) and because the other part must
120+
* not be called due constructing directly with __i915_request_create
121+
* which increments active count via intel_context_mark_active.
122+
*/
123+
GEM_BUG_ON(rq->context->active_count != 1);
124+
__intel_gt_pm_get(engine->gt);
125+
117126
/*
118127
* We have to serialise all potential retirement paths with our
119128
* submission, as we don't want to underflow either the

0 commit comments

Comments
 (0)