drm/xe/mocs: 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()
- don't use xe_assert() to report HW errors (Michal)

v5
- return unsigned int from xe_force_wake_get()
- Remove redundant warn

v7
- Fix commit message

Cc: Michal Wajdeczko <michal.wajdeczko@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-14-himal.prasad.ghimiray@intel.com
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_mocs.c b/drivers/gpu/drm/xe/xe_mocs.c
index 231d0e86ed8359e3f96dff197f394217fd6bfd73..54d199b5cfb21a3045cc6e6311d32f79a86439c9 100644 (file)
--- a/drivers/gpu/drm/xe/xe_mocs.c
+++ b/drivers/gpu/drm/xe/xe_mocs.c
@@ -774,25 +774,21 @@ void xe_mocs_init(struct xe_gt *gt)
 
 void xe_mocs_dump(struct xe_gt *gt, struct drm_printer *p)
 {
-       struct xe_mocs_info table;
-       unsigned int flags;
-       u32 ret;
        struct xe_device *xe = gt_to_xe(gt);
+       struct xe_mocs_info table;
+       unsigned int fw_ref, flags;
 
        flags = get_mocs_settings(xe, &table);
 
        xe_pm_runtime_get_noresume(xe);
-       ret = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
-
-       if (ret)
+       fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
+       if (!fw_ref)
                goto err_fw;
 
        table.ops->dump(&table, flags, gt, p);
 
-       xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
-
+       xe_force_wake_put(gt_to_fw(gt), fw_ref);
 err_fw:
-       xe_assert(xe, !ret);
        xe_pm_runtime_put(xe);
 }