Commit d666a494 authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Andi Shyti
Browse files

Revert "drm/i915: Wait for active retire before i915_active_fini()" 



This reverts commit 7a2280e8, obsoleted
by "drm/i915/vma: Fix UAF on destroy against retire race".

Signed-off-by: default avatarJanusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Cc: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: default avatarNirmoy Das <nirmoy.das@intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240305143747.335367-8-janusz.krzysztofik@linux.intel.com
parent 1f33dc0c

drivers/gpu/drm/i915/i915_vma.c

+0 −2
Original line number Diff line number Diff line
@@ -1776,8 +1776,6 @@ static void release_references(struct i915_vma *vma, struct intel_gt *gt, 
	if (vm_ddestroy)

		i915_vm_resv_put(vma->vm);



	/* Wait for async active retire */

	i915_active_wait(&vma->active);

	i915_active_fini(&vma->active);

	GEM_WARN_ON(vma->resource);

	i915_vma_free(vma);