[PATCH 5/8] drm/xe/coredump: Use guard helpers for xe_force_wake.

[Maarten Lankhorst]

---
 drivers/gpu/drm/xe/xe_devcoredump.c | 36 ++++++++++++++---------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_devcoredump.c 
b/drivers/gpu/drm/xe/xe_devcoredump.c
index 39fe485d20858..afe229fba8a9c 100644
--- a/drivers/gpu/drm/xe/xe_devcoredump.c
+++ b/drivers/gpu/drm/xe/xe_devcoredump.c
@@ -233,7 +233,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
@@ -247,12 +246,13 @@ 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))
-               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);
+       scoped_guard(xe_force_wake, gt_to_fw(ss->gt), XE_FORCEWAKE_ALL) {
+               if (!xe_force_wake_scope_has_domain(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_pm_runtime_put(xe);
 
@@ -277,7 +277,6 @@ 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;
 
@@ -305,20 +304,19 @@ 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);
-
-       ss->guc.log = xe_guc_log_snapshot_capture(&guc->log, true);
-       ss->guc.ct = xe_guc_ct_snapshot_capture(&guc->ct);
-       ss->ge = xe_guc_exec_queue_snapshot_capture(q);
-       if (job)
-               ss->job = xe_sched_job_snapshot_capture(job);
-       ss->vm = xe_vm_snapshot_capture(q->vm);
-
-       xe_engine_snapshot_capture_for_queue(q);
+       scoped_guard(xe_force_wake, gt_to_fw(ss->gt), XE_FORCEWAKE_ALL) {
+               ss->guc.log = xe_guc_log_snapshot_capture(&guc->log, true);
+               ss->guc.ct = xe_guc_ct_snapshot_capture(&guc->ct);
+               ss->ge = xe_guc_exec_queue_snapshot_capture(q);
+               if (job)
+                       ss->job = xe_sched_job_snapshot_capture(job);
+               ss->vm = xe_vm_snapshot_capture(q->vm);
+
+               xe_engine_snapshot_capture_for_queue(q);
+       }
 
        queue_work(system_unbound_wq, &ss->work);
 
-       xe_force_wake_put(gt_to_fw(q->gt), fw_ref);
        dma_fence_end_signalling(cookie);
 }
 
-- 
2.47.1