Unverified Commit 85d54760 authored by Himal Prasad Ghimiray's avatar Himal Prasad Ghimiray Committed by Rodrigo Vivi
Browse files

drm/xe/xe_gt_debugfs: Update handling of xe_force_wake_get return 



With xe_force_wake_get() now returning the refcount-incremented
domain mask, a non-zero return value in the case of XE_FORCEWAKE_ALL does
not necessarily indicate success. Use xe_force_wake_ref_has_domain()
determine the status of the call.

Modify the return handling of xe_force_wake_get() accordingly and
pass the return value to xe_force_wake_put().

v3
- return xe_wakeref_t instead of int in xe_force_wake_get()
- xe_force_wake_put() error doesn't need to be checked. It internally
WARNS on domain ack failure.

v5
- return unsigned int for xe_force_wake_get()

v6
- use helper xe_force_wake_ref_has_domain()

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: default avatarHimal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Reviewed-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Reviewed-by: default avatarBadal Nilawar <badal.nilawar@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241014075601.2324382-16-himal.prasad.ghimiray@intel.com


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

drivers/gpu/drm/xe/xe_gt_debugfs.c

+6 −7
Original line number Diff line number Diff line
@@ -90,22 +90,21 @@ static int hw_engines(struct xe_gt *gt, struct drm_printer *p) 
	struct xe_device *xe = gt_to_xe(gt);

	struct xe_hw_engine *hwe;

	enum xe_hw_engine_id id;

	int err;

	unsigned int fw_ref;



	xe_pm_runtime_get(xe);

	err = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);

	if (err) {

	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);

		return err;

		xe_force_wake_put(gt_to_fw(gt), fw_ref);

		return -ETIMEDOUT;

	}



	for_each_hw_engine(hwe, gt, id)

		xe_hw_engine_print(hwe, p);



	err = xe_force_wake_put(gt_to_fw(gt), XE_FORCEWAKE_ALL);

	xe_force_wake_put(gt_to_fw(gt), fw_ref);

	xe_pm_runtime_put(xe);

	if (err)

		return err;



	return 0;

}