]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/xe/guc_pc: move pc_fini to devm
authorMatthew Auld <matthew.auld@intel.com>
Wed, 22 May 2024 10:21:49 +0000 (11:21 +0100)
committerMatthew Auld <matthew.auld@intel.com>
Wed, 22 May 2024 12:22:39 +0000 (13:22 +0100)
Here we are touching the HW/GuC and presumably this should happen when
the device is removed. Currently if you hotunplug the device this is
skipped if there is already open driver instance.

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240522102143.128069-24-matthew.auld@intel.com
drivers/gpu/drm/xe/xe_guc_pc.c

index d10aab29651e77e9ab4aa9c8ea6e54ab818f130c..14af348aecf291fd72fa815f06930bcf65a108f4 100644 (file)
@@ -890,10 +890,9 @@ int xe_guc_pc_stop(struct xe_guc_pc *pc)
 
 /**
  * xe_guc_pc_fini - Finalize GuC's Power Conservation component
- * @drm: DRM device
  * @arg: opaque pointer that should point to Xe_GuC_PC instance
  */
-static void xe_guc_pc_fini(struct drm_device *drm, void *arg)
+static void xe_guc_pc_fini(void *arg)
 {
        struct xe_guc_pc *pc = arg;
        struct xe_device *xe = pc_to_xe(pc);
@@ -941,5 +940,5 @@ int xe_guc_pc_init(struct xe_guc_pc *pc)
 
        pc->bo = bo;
 
-       return drmm_add_action_or_reset(&xe->drm, xe_guc_pc_fini, pc);
+       return devm_add_action_or_reset(xe->drm.dev, xe_guc_pc_fini, pc);
 }