Unverified Commit 432cd94e authored by Shuicheng Lin's avatar Shuicheng Lin Committed by Rodrigo Vivi
Browse files

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: 85d54760 ("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: default avatarShuicheng Lin <shuicheng.lin@intel.com>
Reviewed-by: default avatarHimal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Link: https://lore.kernel.org/r/20250507022302.2187527-1-shuicheng.lin@intel.com


Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 9d80698b

drivers/gpu/drm/xe/xe_gt_debugfs.c

+5 −4
Original line number Diff line number Diff line
@@ -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)