drm/xe: Release force wake first then runtime power

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>
Reviewed-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Link: https://lore.kernel.org/r/20250507022302.2187527-1-shuicheng.lin@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
(cherry picked from commit 432cd94efdca06296cc5e76d673546f58aa90ee1)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_gt_debugfs.c b/drivers/gpu/drm/xe/xe_gt_debugfs.c
index 2d63a69cbfa38e59b04416412b978f02168ecdeb..f7005a3643e6274eff7a68d5dab9e888951bcd8e 100644 (file)
--- 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)