From cd506a33b0d9759e0a58556799b1b38650fa3698 Mon Sep 17 00:00:00 2001 From: Matthew Auld Date: Wed, 22 May 2024 11:21:56 +0100 Subject: [PATCH] drm/xe: make gt_remove use devm No need to hand roll the onion unwind here, just move gt_remove over to devm which will already have the correct ordering. Signed-off-by: Matthew Auld Cc: Andrzej Hajda Cc: Rodrigo Vivi Reviewed-by: Andrzej Hajda Link: https://patchwork.freedesktop.org/patch/msgid/20240522102143.128069-31-matthew.auld@intel.com --- drivers/gpu/drm/xe/xe_device.c | 22 ++-------------------- drivers/gpu/drm/xe/xe_gt.c | 16 +++++++--------- drivers/gpu/drm/xe/xe_gt.h | 1 - 3 files changed, 9 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c index b825788067fc..56ea4c158a2a 100644 --- a/drivers/gpu/drm/xe/xe_device.c +++ b/drivers/gpu/drm/xe/xe_device.c @@ -538,7 +538,6 @@ int xe_device_probe(struct xe_device *xe) struct xe_tile *tile; struct xe_gt *gt; int err; - u8 last_gt; u8 id; xe_pat_init_early(xe); @@ -626,18 +625,16 @@ int xe_device_probe(struct xe_device *xe) goto err_irq_shutdown; for_each_gt(gt, xe, id) { - last_gt = id; - err = xe_gt_init(gt); if (err) - goto err_fini_gt; + goto err_irq_shutdown; } xe_heci_gsc_init(xe); err = xe_display_init(xe); if (err) - goto err_fini_gt; + goto err_irq_shutdown; err = drm_dev_register(&xe->drm, 0); if (err) @@ -653,15 +650,6 @@ int xe_device_probe(struct xe_device *xe) err_fini_display: xe_display_driver_remove(xe); - -err_fini_gt: - for_each_gt(gt, xe, id) { - if (id < last_gt) - xe_gt_remove(gt); - else - break; - } - err_irq_shutdown: xe_irq_shutdown(xe); err: @@ -679,18 +667,12 @@ static void xe_device_remove_display(struct xe_device *xe) void xe_device_remove(struct xe_device *xe) { - struct xe_gt *gt; - u8 id; - xe_device_remove_display(xe); xe_display_fini(xe); xe_heci_gsc_fini(xe); - for_each_gt(gt, xe, id) - xe_gt_remove(gt); - xe_irq_shutdown(xe); } diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c index 98c2228b51d0..6f4b59a6e710 100644 --- a/drivers/gpu/drm/xe/xe_gt.c +++ b/drivers/gpu/drm/xe/xe_gt.c @@ -93,16 +93,14 @@ void xe_gt_sanitize(struct xe_gt *gt) gt->uc.guc.submission_state.enabled = false; } -/** - * xe_gt_remove() - Clean up the GT structures before driver removal - * @gt: the GT object - * - * This function should only act on objects/structures that must be cleaned - * before the driver removal callback is complete and therefore can't be - * deferred to a drmm action. +/* + * Clean up the GT structures before driver removal. This function should only + * act on objects/structures that must be cleaned before the driver removal + * callback is complete and therefore can't be deferred to a drmm action. */ -void xe_gt_remove(struct xe_gt *gt) +static void gt_remove(void *arg) { + struct xe_gt *gt = arg; int i; xe_uc_remove(>->uc); @@ -568,7 +566,7 @@ int xe_gt_init(struct xe_gt *gt) xe_gt_record_user_engines(gt); - return 0; + return devm_add_action_or_reset(gt_to_xe(gt)->drm.dev, gt_remove, gt); } void xe_gt_record_user_engines(struct xe_gt *gt) diff --git a/drivers/gpu/drm/xe/xe_gt.h b/drivers/gpu/drm/xe/xe_gt.h index 9073ac68a777..d0747edfe020 100644 --- a/drivers/gpu/drm/xe/xe_gt.h +++ b/drivers/gpu/drm/xe/xe_gt.h @@ -56,7 +56,6 @@ int xe_gt_suspend(struct xe_gt *gt); int xe_gt_resume(struct xe_gt *gt); void xe_gt_reset_async(struct xe_gt *gt); void xe_gt_sanitize(struct xe_gt *gt); -void xe_gt_remove(struct xe_gt *gt); /** * xe_gt_any_hw_engine_by_reset_domain - scan the list of engines and return the