All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/xe: Release force wake first then runtime power
@ 2025-05-07  2:23 Shuicheng Lin
  2025-05-07  2:28 ` ✓ CI.Patch_applied: success for " Patchwork
                   ` (9 more replies)
  0 siblings, 10 replies; 12+ messages in thread
From: Shuicheng Lin @ 2025-05-07  2:23 UTC (permalink / raw)
  To: intel-xe; +Cc: Shuicheng Lin, Himal Prasad Ghimiray, Rodrigo Vivi

xe_force_wake_get() is dependent on xe_pm_runtime_get(), so for
the release path, xe_force_wake_put() should be called first then
xe_pm_runtime_put().
Combine the error path and normal path together with goto.

Fixes: 85d547608ef5 ("drm/xe/xe_gt_debugfs: Update handling of xe_force_wake_get return")
Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
 drivers/gpu/drm/xe/xe_gt_debugfs.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_gt_debugfs.c
index a88076e9cc7d..119a55bb7580 100644
--- a/drivers/gpu/drm/xe/xe_gt_debugfs.c
+++ b/drivers/gpu/drm/xe/xe_gt_debugfs.c
@@ -92,22 +92,23 @@ static int hw_engines(struct xe_gt *gt, struct drm_printer *p)
 	struct xe_hw_engine *hwe;
 	enum xe_hw_engine_id id;
 	unsigned int fw_ref;
+	int ret = 0;
 
 	xe_pm_runtime_get(xe);
 	fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
 	if (!xe_force_wake_ref_has_domain(fw_ref, XE_FORCEWAKE_ALL)) {
-		xe_pm_runtime_put(xe);
-		xe_force_wake_put(gt_to_fw(gt), fw_ref);
-		return -ETIMEDOUT;
+		ret = -ETIMEDOUT;
+		goto fw_put;
 	}
 
 	for_each_hw_engine(hwe, gt, id)
 		xe_hw_engine_print(hwe, p);
 
+fw_put:
 	xe_force_wake_put(gt_to_fw(gt), fw_ref);
 	xe_pm_runtime_put(xe);
 
-	return 0;
+	return ret;
 }
 
 static int powergate_info(struct xe_gt *gt, struct drm_printer *p)
-- 
2.25.1


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

end of thread, other threads:[~2025-05-26 16:46 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-05-07  2:23 [PATCH] drm/xe: Release force wake first then runtime power Shuicheng Lin
2025-05-07  2:28 ` ✓ CI.Patch_applied: success for " Patchwork
2025-05-07  2:28 ` ✓ CI.checkpatch: " Patchwork
2025-05-07  2:30 ` ✓ CI.KUnit: " Patchwork
2025-05-07  2:38 ` ✓ CI.Build: " Patchwork
2025-05-07  2:40 ` ✓ CI.Hooks: " Patchwork
2025-05-07  2:42 ` ✓ CI.checksparse: " Patchwork
2025-05-07  3:09 ` ✓ Xe.CI.BAT: " Patchwork
2025-05-07  3:49 ` [PATCH] " Ghimiray, Himal Prasad
2025-05-07 19:30   ` Rodrigo Vivi
2025-05-07  5:05 ` ✗ Xe.CI.Full: failure for " Patchwork
2025-05-26 16:46 ` ✗ CI.Patch_applied: " Patchwork

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.