Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Badal Nilawar <badal.nilawar@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241014075601.2324382-18-himal.prasad.ghimiray@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

authored by

Himal Prasad Ghimiray and committed by
Rodrigo Vivi
b79ec335 31a5dce0

+4 -4
+4 -4
drivers/gpu/drm/xe/xe_huc.c
··· 296 296 void xe_huc_print_info(struct xe_huc *huc, struct drm_printer *p) 297 297 { 298 298 struct xe_gt *gt = huc_to_gt(huc); 299 - int err; 299 + unsigned int fw_ref; 300 300 301 301 xe_uc_fw_print(&huc->fw, p); 302 302 303 303 if (!xe_uc_fw_is_enabled(&huc->fw)) 304 304 return; 305 305 306 - err = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT); 307 - if (err) 306 + fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT); 307 + if (!fw_ref) 308 308 return; 309 309 310 310 drm_printf(p, "\nHuC status: 0x%08x\n", 311 311 xe_mmio_read32(&gt->mmio, HUC_KERNEL_LOAD_INFO)); 312 312 313 - xe_force_wake_put(gt_to_fw(gt), XE_FW_GT); 313 + xe_force_wake_put(gt_to_fw(gt), fw_ref); 314 314 }