[Intel-gfx] [RFC PATCH 93/97] drm/i915/guc: Take engine PM when a context is pinned with GuC submission

[Matthew Brost]

Taking a PM reference to prevent intel_gt_wait_for_idle from short
circuiting while a scheduling of user context could be enabled.

Signed-off-by: Matthew Brost <matthew.br...@intel.com>
---
 .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c 
b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index 25c77084c3a0..dd4baaad679f 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -2026,7 +2026,12 @@ static int guc_context_pre_pin(struct intel_context *ce,
 
 static int guc_context_pin(struct intel_context *ce, void *vaddr)
 {
-       return __guc_context_pin(ce, ce->engine, vaddr);
+       int ret = __guc_context_pin(ce, ce->engine, vaddr);
+
+       if (likely(!ret && !intel_context_is_barrier(ce)))
+               intel_engine_pm_get(ce->engine);
+
+       return ret;
 }
 
 static void guc_context_unpin(struct intel_context *ce)
@@ -2037,6 +2042,9 @@ static void guc_context_unpin(struct intel_context *ce)
 
        unpin_guc_id(guc, ce, true);
        lrc_unpin(ce);
+
+       if (likely(!intel_context_is_barrier(ce)))
+               intel_engine_pm_put(ce->engine);
 }
 
 static void guc_context_post_unpin(struct intel_context *ce)
@@ -2922,8 +2930,30 @@ static int guc_virtual_context_pre_pin(struct 
intel_context *ce,
 static int guc_virtual_context_pin(struct intel_context *ce, void *vaddr)
 {
        struct intel_engine_cs *engine = guc_virtual_get_sibling(ce->engine, 0);
+       int ret = __guc_context_pin(ce, engine, vaddr);
+       intel_engine_mask_t tmp, mask = ce->engine->mask;
+
+       if (likely(!ret))
+               for_each_engine_masked(engine, ce->engine->gt, mask, tmp)
+                       intel_engine_pm_get(engine);
+
+       return ret;
+}
+
+static void guc_virtual_context_unpin(struct intel_context *ce)
+{
+       intel_engine_mask_t tmp, mask = ce->engine->mask;
+       struct intel_engine_cs *engine;
+       struct intel_guc *guc = ce_to_guc(ce);
 
-       return __guc_context_pin(ce, engine, vaddr);
+       GEM_BUG_ON(context_enabled(ce));
+       GEM_BUG_ON(intel_context_is_barrier(ce));
+
+       unpin_guc_id(guc, ce, true);
+       lrc_unpin(ce);
+
+       for_each_engine_masked(engine, ce->engine->gt, mask, tmp)
+               intel_engine_pm_put(engine);
 }
 
 static void guc_virtual_context_enter(struct intel_context *ce)
@@ -2972,7 +3002,7 @@ static const struct intel_context_ops 
virtual_guc_context_ops = {
 
        .pre_pin = guc_virtual_context_pre_pin,
        .pin = guc_virtual_context_pin,
-       .unpin = guc_context_unpin,
+       .unpin = guc_virtual_context_unpin,
        .post_unpin = guc_context_post_unpin,
 
        .ban = guc_context_ban,
-- 
2.28.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx