]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
drm/xe: Take PM ref in delayed snapshot capture worker
authorMatthew Brost <matthew.brost@intel.com>
Tue, 26 Nov 2024 17:46:11 +0000 (09:46 -0800)
committerThomas Hellström <thomas.hellstrom@linux.intel.com>
Thu, 28 Nov 2024 14:22:36 +0000 (15:22 +0100)
The delayed snapshot capture worker can access the GPU or VRAM both of
which require a PM reference. Take a reference in this worker.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Fixes: 4f04d07c0a94 ("drm/xe: Faster devcoredump")
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241126174615.2665852-5-matthew.brost@intel.com
(cherry picked from commit 1c6878af115a4586a40d6c14d530fa9f93e0bd83)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
drivers/gpu/drm/xe/xe_devcoredump.c

index d2679c5d976b066ada22dfeb9b89a5c53bdf5e84..0b0cd6aa1d9fb4663454c0d921096a021dbf1de6 100644 (file)
@@ -23,6 +23,7 @@
 #include "xe_guc_submit.h"
 #include "xe_hw_engine.h"
 #include "xe_module.h"
+#include "xe_pm.h"
 #include "xe_sched_job.h"
 #include "xe_vm.h"
 
@@ -158,8 +159,11 @@ 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;
 
+       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))
@@ -168,6 +172,8 @@ static void xe_devcoredump_deferred_snap_work(struct work_struct *work)
        xe_guc_exec_queue_snapshot_capture_delayed(ss->ge);
        xe_force_wake_put(gt_to_fw(ss->gt), fw_ref);
 
+       xe_pm_runtime_put(xe);
+
        /* Calculate devcoredump size */
        ss->read.size = __xe_devcoredump_read(NULL, INT_MAX, coredump);