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

drm/xe/xe_drm_client: 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. Use helper xe_force_wake_ref_has_domain to
verify all domains are initialized or not. 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()
- xe_force_wake_put() error doesn't need to be checked. It internally
WARNS on domain ack failure.

v5
- return unsigned int from xe_force_wake_get()

v6
- use xe_force_wake_ref_has_domain()

v7
- Fix commit message

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-15-himal.prasad.ghimiray@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

authored by

Himal Prasad Ghimiray and committed by
Rodrigo Vivi
7fe17fa5 a4c48a3f

+6 -2
+6 -2
drivers/gpu/drm/xe/xe_drm_client.c
··· 278 278 struct xe_hw_engine *hwe; 279 279 struct xe_exec_queue *q; 280 280 u64 gpu_timestamp; 281 + unsigned int fw_ref; 281 282 282 283 xe_pm_runtime_get(xe); 283 284 ··· 304 303 continue; 305 304 306 305 fw = xe_hw_engine_to_fw_domain(hwe); 307 - if (xe_force_wake_get(gt_to_fw(gt), fw)) { 306 + 307 + fw_ref = xe_force_wake_get(gt_to_fw(gt), fw); 308 + if (!xe_force_wake_ref_has_domain(fw_ref, fw)) { 308 309 hwe = NULL; 310 + xe_force_wake_put(gt_to_fw(gt), fw_ref); 309 311 break; 310 312 } 311 313 312 314 gpu_timestamp = xe_hw_engine_read_timestamp(hwe); 313 - XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), fw)); 315 + xe_force_wake_put(gt_to_fw(gt), fw_ref); 314 316 break; 315 317 } 316 318