From: Matthew Brost Date: Tue, 20 Aug 2024 17:29:53 +0000 (-0700) Subject: drm/xe: Move ggtt_fini to devm managed X-Git-Tag: v6.12-rc1~126^2~15^2~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b993d00d7f0c970a5e5d34c1031069fb13b6986;p=thirdparty%2Fkernel%2Flinux.git drm/xe: Move ggtt_fini to devm managed ggtt->scratch is destroyed via devm, ggtt_fini sets ggtt->scratch to NULL, ggtt->scratch in GGTT clears, so ensure ggtt->scratch is set NULL before the BO is destroyed. Signed-off-by: Matthew Brost Reviewed-by: Lucas De Marchi Link: https://patchwork.freedesktop.org/patch/msgid/20240820172958.1095143-2-matthew.brost@intel.com --- diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c index b4a0cd2b62ed1..a3ce91decdce7 100644 --- a/drivers/gpu/drm/xe/xe_ggtt.c +++ b/drivers/gpu/drm/xe/xe_ggtt.c @@ -166,7 +166,7 @@ static void ggtt_fini_early(struct drm_device *drm, void *arg) drm_mm_takedown(&ggtt->mm); } -static void ggtt_fini(struct drm_device *drm, void *arg) +static void ggtt_fini(void *arg) { struct xe_ggtt *ggtt = arg; @@ -374,7 +374,7 @@ int xe_ggtt_init(struct xe_ggtt *ggtt) xe_ggtt_initial_clear(ggtt); - return drmm_add_action_or_reset(&xe->drm, ggtt_fini, ggtt); + return devm_add_action_or_reset(xe->drm.dev, ggtt_fini, ggtt); err: ggtt->scratch = NULL; return err;