Skip to content

Commit

Permalink
drm/xe/guc_pc: move pc_fini to devm
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Matthew Auld committed May 22, 2024
1 parent 19fa7aa commit c9f422d
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/gpu/drm/xe/xe_guc_pc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}

0 comments on commit c9f422d

Please sign in to comment.