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

drm/xe/huc: Update handling of xe_force_wake_get return 



xe_force_wake_get() now returns the reference count-incremented domain
mask. If it fails for individual domains, the return value will always
be 0. However, for XE_FORCEWAKE_ALL, it may return a non-zero value even
in the event of failure. Update the return handling of xe_force_wake_get()
to reflect this behavior, and ensure that the return value is passed as
input to xe_force_wake_put().

v3
- return xe_wakeref_t instead of int in xe_force_wake_get()

v5
- return unsigned int from xe_force_wake_get()

v7
- Fix commit message

Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
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-18-himal.prasad.ghimiray@intel.com


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

drivers/gpu/drm/xe/xe_huc.c

+4 −4
Original line number Diff line number Diff line
@@ -296,19 +296,19 @@ void xe_huc_sanitize(struct xe_huc *huc) 
void xe_huc_print_info(struct xe_huc *huc, struct drm_printer *p)

{

	struct xe_gt *gt = huc_to_gt(huc);

	int err;

	unsigned int fw_ref;



	xe_uc_fw_print(&huc->fw, p);



	if (!xe_uc_fw_is_enabled(&huc->fw))

		return;



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

	if (err)

	fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);

	if (!fw_ref)

		return;



	drm_printf(p, "\nHuC status: 0x%08x\n",

		   xe_mmio_read32(&gt->mmio, HUC_KERNEL_LOAD_INFO));



	xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);

	xe_force_wake_put(gt_to_fw(gt), fw_ref);

}