All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/9] drm/xe: Introduce xe_pm_runtime_get_noresume for inner callers
@ 2024-04-10  1:58 Rodrigo Vivi
  2024-04-10  1:58 ` [PATCH 2/9] drm/xe: Introduce intel_runtime_pm_get_noresume at compat-i915-headers for display Rodrigo Vivi
                   ` (16 more replies)
  0 siblings, 17 replies; 30+ messages in thread
From: Rodrigo Vivi @ 2024-04-10  1:58 UTC (permalink / raw)
  To: intel-xe; +Cc: Rodrigo Vivi, Matthew Auld

Let's ensure that we have an option for inner callers that will
raise WARN if device is not active and not protected by outer callers.

Make this also a void function forcing every caller to unconditionally
put the reference back afterwards.

This will be very important for cases where we want to hold the
reference before scheduling a work in a queue. Then the work job
will be responsible for putting it back.

While at this, already convert a case from mem_access_get_ongoing where
it is not checking for the reference and put it back, what would
cause the underflow.

v2: Fix identation.
v3: Convert equivalent missing put from mem_access towards pm_runtime.

Reviewed-by: Matthew Auld <matthew.auld@intel.com> #v1
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
---
 drivers/gpu/drm/xe/xe_exec_queue.c |  4 ++--
 drivers/gpu/drm/xe/xe_pm.c         | 20 ++++++++++++++++++++
 drivers/gpu/drm/xe/xe_pm.h         |  1 +
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c
index 71bd52dfebcf..50ec661116a2 100644
--- a/drivers/gpu/drm/xe/xe_exec_queue.c
+++ b/drivers/gpu/drm/xe/xe_exec_queue.c
@@ -128,7 +128,7 @@ static int __xe_exec_queue_init(struct xe_exec_queue *q)
 	 * already grabbed the rpm ref outside any sensitive locks.
 	 */
 	if (!(q->flags & EXEC_QUEUE_FLAG_PERMANENT) && (q->flags & EXEC_QUEUE_FLAG_VM || !q->vm))
-		drm_WARN_ON(&xe->drm, !xe_device_mem_access_get_if_ongoing(xe));
+		xe_pm_runtime_get_noresume(xe);
 
 	return 0;
 
@@ -217,7 +217,7 @@ void xe_exec_queue_fini(struct xe_exec_queue *q)
 	for (i = 0; i < q->width; ++i)
 		xe_lrc_finish(q->lrc + i);
 	if (!(q->flags & EXEC_QUEUE_FLAG_PERMANENT) && (q->flags & EXEC_QUEUE_FLAG_VM || !q->vm))
-		xe_device_mem_access_put(gt_to_xe(q->gt));
+		xe_pm_runtime_put(gt_to_xe(q->gt));
 	__xe_exec_queue_free(q);
 }
 
diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
index 9ef03f23a2d7..1692cf08e950 100644
--- a/drivers/gpu/drm/xe/xe_pm.c
+++ b/drivers/gpu/drm/xe/xe_pm.c
@@ -489,6 +489,26 @@ bool xe_pm_runtime_get_if_in_use(struct xe_device *xe)
 	return pm_runtime_get_if_in_use(xe->drm.dev) > 0;
 }
 
+/**
+ * xe_pm_runtime_get_noresume - Bump runtime PM usage counter without resuming
+ * @xe: xe device instance
+ *
+ * This function should be used in inner places where it is surely already
+ * protected by outer-bound callers of `xe_pm_runtime_get`.
+ * It will warn if not protected.
+ * The reference should be put back after this function regardless, since it
+ * will always bump the usage counter, regardless.
+ */
+void xe_pm_runtime_get_noresume(struct xe_device *xe)
+{
+	bool ref;
+
+	ref = xe_pm_runtime_get_if_in_use(xe);
+
+	if (drm_WARN(&xe->drm, !ref, "Missing outer runtime PM protection\n"))
+		pm_runtime_get_noresume(xe->drm.dev);
+}
+
 /**
  * xe_pm_runtime_resume_and_get - Resume, then get a runtime_pm ref if awake.
  * @xe: xe device instance
diff --git a/drivers/gpu/drm/xe/xe_pm.h b/drivers/gpu/drm/xe/xe_pm.h
index 0cb38ca244fe..119b630ad1d1 100644
--- a/drivers/gpu/drm/xe/xe_pm.h
+++ b/drivers/gpu/drm/xe/xe_pm.h
@@ -31,6 +31,7 @@ int xe_pm_runtime_get_ioctl(struct xe_device *xe);
 void xe_pm_runtime_put(struct xe_device *xe);
 int xe_pm_runtime_get_if_active(struct xe_device *xe);
 bool xe_pm_runtime_get_if_in_use(struct xe_device *xe);
+void xe_pm_runtime_get_noresume(struct xe_device *xe);
 bool xe_pm_runtime_resume_and_get(struct xe_device *xe);
 void xe_pm_assert_unbounded_bridge(struct xe_device *xe);
 int xe_pm_set_vram_threshold(struct xe_device *xe, u32 threshold);
-- 
2.44.0


^ permalink raw reply related	[flat|nested] 30+ messages in thread

end of thread, other threads:[~2024-04-19 13:45 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-10  1:58 [PATCH 1/9] drm/xe: Introduce xe_pm_runtime_get_noresume for inner callers Rodrigo Vivi
2024-04-10  1:58 ` [PATCH 2/9] drm/xe: Introduce intel_runtime_pm_get_noresume at compat-i915-headers for display Rodrigo Vivi
2024-04-10  1:58 ` [PATCH 3/9] drm/i915/display: convert inner wakeref get towards get_if_in_use Rodrigo Vivi
2024-04-10  1:58 ` [PATCH 4/9] drm/xe: Move lockdep protection from mem_access to xe_pm_runtime Rodrigo Vivi
2024-04-10  1:58 ` [PATCH 5/9] drm/xe: Remove useless mem_access during probe Rodrigo Vivi
2024-04-10  1:58 ` [PATCH 6/9] drm/xe: Convert xe_gem_fault to use direct xe_pm_runtime calls Rodrigo Vivi
2024-04-10  1:58 ` [PATCH 7/9] drm/xe: Removing extra mem_access protection from runtime pm Rodrigo Vivi
2024-04-10  1:58 ` [PATCH 8/9] drm/xe: Convert mem_access_if_ongoing to direct xe_pm_runtime_get_if_active Rodrigo Vivi
2024-04-10  1:58 ` [PATCH 9/9] drm/xe: Ensure all the inner access are using the _noresume variant Rodrigo Vivi
2024-04-10  2:03 ` ✓ CI.Patch_applied: success for series starting with [1/9] drm/xe: Introduce xe_pm_runtime_get_noresume for inner callers Patchwork
2024-04-10  2:04 ` ✓ CI.checkpatch: " Patchwork
2024-04-10  2:05 ` ✓ CI.KUnit: " Patchwork
2024-04-10  2:16 ` ✓ CI.Build: " Patchwork
2024-04-10  2:19 ` ✓ CI.Hooks: " Patchwork
2024-04-10  2:20 ` ✗ CI.checksparse: warning " Patchwork
2024-04-10  2:47 ` ✗ CI.BAT: failure " Patchwork
2024-04-17 19:34   ` [PATCH] drm/xe: Add outer runtime_pm protection to xe_live_ktest@xe_dma_buf Rodrigo Vivi
2024-04-17 20:10     ` Matthew Brost
2024-04-17 20:12       ` Rodrigo Vivi
2024-04-17 20:32         ` Matthew Brost
2024-04-17 20:47   ` ✓ CI.Patch_applied: success for " Patchwork
2024-04-17 20:48   ` ✗ CI.checkpatch: warning " Patchwork
2024-04-17 20:49   ` ✓ CI.KUnit: success " Patchwork
2024-04-17 21:05   ` ✓ CI.Build: " Patchwork
2024-04-17 21:08   ` ✓ CI.Hooks: " Patchwork
2024-04-17 21:10   ` ✓ CI.checksparse: " Patchwork
2024-04-17 21:45   ` ✗ CI.BAT: failure " Patchwork
2024-04-19 13:45   ` ✗ CI.FULL: " Patchwork
2024-04-10  3:58 ` ✓ CI.FULL: success for series starting with [1/9] drm/xe: Introduce xe_pm_runtime_get_noresume for inner callers Patchwork
2024-04-10  8:20 ` [PATCH 1/9] " Matthew Auld

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.