Revert "drm/xe/devcoredump: Update handling of xe_force_wake_get return"

This reverts commit 9ffd6ec2de08ef4ac5f17f6131d1db57613493f9.

The reverted commit updated the handling of xe_force_wake_get to match
the new "return refcounted domain mask" semantics introduced in commit
a7ddcea1f5ac ("drm/xe: Error handling in xe_force_wake_get()"). However,
that API change only exists in 6.13 and later.

In 6.12 stable kernel, xe_force_wake_get still returns a status code.
The update incorrectly treats the return value as a mask, causing the
return value of 0 to be misinterpreted as an error

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Cc: Nirmoy Das <nirmoy.das@intel.com>
Cc: Badal Nilawar <badal.nilawar@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Tomita Moeko <tomitamoeko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/xe/xe_devcoredump.c b/drivers/gpu/drm/xe/xe_devcoredump.c
index 8050938389b68f9347af8ec0827408a9c6329684..e412a70323ccbd4ee29df06408d568c5ec80223e 100644 (file)
--- a/drivers/gpu/drm/xe/xe_devcoredump.c
+++ b/drivers/gpu/drm/xe/xe_devcoredump.c
@@ -197,7 +197,6 @@ static void xe_devcoredump_deferred_snap_work(struct work_struct *work)
        struct xe_devcoredump_snapshot *ss = container_of(work, typeof(*ss), work);
        struct xe_devcoredump *coredump = container_of(ss, typeof(*coredump), snapshot);
        struct xe_device *xe = coredump_to_xe(coredump);
-       unsigned int fw_ref;
 
        /*
         * NB: Despite passing a GFP_ flags parameter here, more allocations are done
@@ -211,12 +210,11 @@ static void xe_devcoredump_deferred_snap_work(struct work_struct *work)
        xe_pm_runtime_get(xe);
 
        /* keep going if fw fails as we still want to save the memory and SW data */
-       fw_ref = xe_force_wake_get(gt_to_fw(ss->gt), XE_FORCEWAKE_ALL);
-       if (!xe_force_wake_ref_has_domain(fw_ref, XE_FORCEWAKE_ALL))
+       if (xe_force_wake_get(gt_to_fw(ss->gt), XE_FORCEWAKE_ALL))
                xe_gt_info(ss->gt, "failed to get forcewake for coredump capture\n");
        xe_vm_snapshot_capture_delayed(ss->vm);
        xe_guc_exec_queue_snapshot_capture_delayed(ss->ge);
-       xe_force_wake_put(gt_to_fw(ss->gt), fw_ref);
+       xe_force_wake_put(gt_to_fw(ss->gt), XE_FORCEWAKE_ALL);
 
        xe_pm_runtime_put(xe);
 
@@ -243,9 +241,8 @@ static void devcoredump_snapshot(struct xe_devcoredump *coredump,
        u32 width_mask = (0x1 << q->width) - 1;
        const char *process_name = "no process";
 
-       unsigned int fw_ref;
-       bool cookie;
        int i;
+       bool cookie;
 
        ss->snapshot_time = ktime_get_real();
        ss->boot_time = ktime_get_boottime();
@@ -268,7 +265,8 @@ static void devcoredump_snapshot(struct xe_devcoredump *coredump,
        }
 
        /* keep going if fw fails as we still want to save the memory and SW data */
-       fw_ref = xe_force_wake_get(gt_to_fw(q->gt), XE_FORCEWAKE_ALL);
+       if (xe_force_wake_get(gt_to_fw(q->gt), XE_FORCEWAKE_ALL))
+               xe_gt_info(ss->gt, "failed to get forcewake for coredump capture\n");
 
        ss->ct = xe_guc_ct_snapshot_capture(&guc->ct, true);
        ss->ge = xe_guc_exec_queue_snapshot_capture(q);
@@ -286,7 +284,7 @@ static void devcoredump_snapshot(struct xe_devcoredump *coredump,
 
        queue_work(system_unbound_wq, &ss->work);
 
-       xe_force_wake_put(gt_to_fw(q->gt), fw_ref);
+       xe_force_wake_put(gt_to_fw(q->gt), XE_FORCEWAKE_ALL);
        dma_fence_end_signalling(cookie);
 }