diff options
| author | Matthew Auld <matthew.auld@intel.com> | 2024-05-22 11:21:55 +0100 |
|---|---|---|
| committer | Matthew Auld <matthew.auld@intel.com> | 2024-05-22 13:22:39 +0100 |
| commit | 1bd985ff9fc463a72e4ceb65ae6bcb735ce93c25 (patch) | |
| tree | 3a11e21c89b525cc534a79615ad8c2df54856bb1 /drivers/gpu/drm/xe/xe_gt.c | |
| parent | cf13ae6b81d5402ba93c46635dd46eb19ab49c4c (diff) | |
| download | linux-stable-1bd985ff9fc463a72e4ceb65ae6bcb735ce93c25.tar.gz linux-stable-1bd985ff9fc463a72e4ceb65ae6bcb735ce93c25.tar.bz2 linux-stable-1bd985ff9fc463a72e4ceb65ae6bcb735ce93c25.zip | |
drm/xe/gt: break out gt_fini into sw vs hw state
Have a cleaner separation between hw vs sw.
v2: Fix missing return
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Andrzej Hajda <andrzej.hajda@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-30-matthew.auld@intel.com
Diffstat (limited to 'drivers/gpu/drm/xe/xe_gt.c')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_gt.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c index 3432fef56486..98c2228b51d0 100644 --- a/drivers/gpu/drm/xe/xe_gt.c +++ b/drivers/gpu/drm/xe/xe_gt.c @@ -58,9 +58,17 @@ #include "xe_wa.h" #include "xe_wopcm.h" +static void gt_fini(struct drm_device *drm, void *arg) +{ + struct xe_gt *gt = arg; + + destroy_workqueue(gt->ordered_wq); +} + struct xe_gt *xe_gt_alloc(struct xe_tile *tile) { struct xe_gt *gt; + int err; gt = drmm_kzalloc(&tile_to_xe(tile)->drm, sizeof(*gt), GFP_KERNEL); if (!gt) @@ -69,6 +77,10 @@ struct xe_gt *xe_gt_alloc(struct xe_tile *tile) gt->tile = tile; gt->ordered_wq = alloc_ordered_workqueue("gt-ordered-wq", 0); + err = drmm_add_action_or_reset(>_to_xe(gt)->drm, gt_fini, gt); + if (err) + return ERR_PTR(err); + return gt; } @@ -91,15 +103,9 @@ void xe_gt_sanitize(struct xe_gt *gt) */ void xe_gt_remove(struct xe_gt *gt) { - xe_uc_remove(>->uc); -} - -static void gt_fini(struct drm_device *drm, void *arg) -{ - struct xe_gt *gt = arg; int i; - destroy_workqueue(gt->ordered_wq); + xe_uc_remove(>->uc); for (i = 0; i < XE_ENGINE_CLASS_MAX; ++i) xe_hw_fence_irq_finish(>->fence_irq[i]); @@ -562,7 +568,7 @@ int xe_gt_init(struct xe_gt *gt) xe_gt_record_user_engines(gt); - return drmm_add_action_or_reset(>_to_xe(gt)->drm, gt_fini, gt); + return 0; } void xe_gt_record_user_engines(struct xe_gt *gt) |