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>

diff --git a/drivers/gpu/drm/xe/xe_drm_client.c b/drivers/gpu/drm/xe/xe_drm_client.c
index fb52a23e28f84ef8b4d2a99a0a41164759158762..22f0f1a6dfd55da6ae0079003a78129a852878b6 100644 (file)
--- a/drivers/gpu/drm/xe/xe_drm_client.c
+++ b/drivers/gpu/drm/xe/xe_drm_client.c
@@ -278,6 +278,7 @@ static void show_run_ticks(struct drm_printer *p, struct drm_file *file)
        struct xe_hw_engine *hwe;
        struct xe_exec_queue *q;
        u64 gpu_timestamp;
+       unsigned int fw_ref;
 
        xe_pm_runtime_get(xe);
 
@@ -303,13 +304,16 @@ static void show_run_ticks(struct drm_printer *p, struct drm_file *file)
                        continue;
 
                fw = xe_hw_engine_to_fw_domain(hwe);
-               if (xe_force_wake_get(gt_to_fw(gt), fw)) {
+
+               fw_ref = xe_force_wake_get(gt_to_fw(gt), fw);
+               if (!xe_force_wake_ref_has_domain(fw_ref, fw)) {
                        hwe = NULL;
+                       xe_force_wake_put(gt_to_fw(gt), fw_ref);
                        break;
                }
 
                gpu_timestamp = xe_hw_engine_read_timestamp(hwe);
-               XE_WARN_ON(xe_force_wake_put(gt_to_fw(gt), fw));
+               xe_force_wake_put(gt_to_fw(gt), fw_ref);
                break;
        }