Skip to content

Commit 5b993d0

Browse files
committed
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 <matthew.brost@intel.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240820172958.1095143-2-matthew.brost@intel.com
1 parent 25ebe10 commit 5b993d0

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpu/drm/xe/xe_ggtt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ static void ggtt_fini_early(struct drm_device *drm, void *arg)
166166
drm_mm_takedown(&ggtt->mm);
167167
}
168168

169-
static void ggtt_fini(struct drm_device *drm, void *arg)
169+
static void ggtt_fini(void *arg)
170170
{
171171
struct xe_ggtt *ggtt = arg;
172172

@@ -374,7 +374,7 @@ int xe_ggtt_init(struct xe_ggtt *ggtt)
374374

375375
xe_ggtt_initial_clear(ggtt);
376376

377-
return drmm_add_action_or_reset(&xe->drm, ggtt_fini, ggtt);
377+
return devm_add_action_or_reset(xe->drm.dev, ggtt_fini, ggtt);
378378
err:
379379
ggtt->scratch = NULL;
380380
return err;

0 commit comments

Comments
 (0)