Skip to content

Commit d666a49

Browse files
jkrzyszt-intelAndi Shyti
authored andcommitted
Revert "drm/i915: Wait for active retire before i915_active_fini()"
This reverts commit 7a2280e, obsoleted by "drm/i915/vma: Fix UAF on destroy against retire race". Signed-off-by: Janusz Krzysztofik <[email protected]> Cc: Nirmoy Das <[email protected]> Reviewed-by: Nirmoy Das <[email protected]> Signed-off-by: Andi Shyti <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 1f33dc0 commit d666a49

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

drivers/gpu/drm/i915/i915_vma.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1776,8 +1776,6 @@ static void release_references(struct i915_vma *vma, struct intel_gt *gt,
17761776
if (vm_ddestroy)
17771777
i915_vm_resv_put(vma->vm);
17781778

1779-
/* Wait for async active retire */
1780-
i915_active_wait(&vma->active);
17811779
i915_active_fini(&vma->active);
17821780
GEM_WARN_ON(vma->resource);
17831781
i915_vma_free(vma);

0 commit comments

Comments
 (0)