Revert "drm/i915: Wait for active retire before i915_active_fini()"
authorJanusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Tue, 5 Mar 2024 14:35:08 +0000 (15:35 +0100)
committerAndi Shyti <andi.shyti@linux.intel.com>
Tue, 26 Mar 2024 08:03:41 +0000 (09:03 +0100)
This reverts commit 7a2280e8dcd2f1f436db9631287c0b21cf6a92b0, obsoleted
by "drm/i915/vma: Fix UAF on destroy against retire race".

Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com>
Cc: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240305143747.335367-8-janusz.krzysztofik@linux.intel.com
drivers/gpu/drm/i915/i915_vma.c

index b70715b..d2f064d 100644 (file)
@@ -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);