Commit afd5cb39 authored by Juha-Pekka Heikkila's avatar Juha-Pekka Heikkila Committed by Matthew Auld
Browse files

drm/i915: don't leak lmem mapping in vma_evict 



Don't leak lmem mapping in vma_evict, move __i915_vma_iounmap outside
i915_vma_is_map_and_fenceable.

Signed-off-by: default avatarJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Signed-off-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220610121205.29645-3-juhapekka.heikkila@gmail.com
parent 7482a656

drivers/gpu/drm/i915/i915_vma.c

+3 −1
Original line number Diff line number Diff line
@@ -1907,9 +1907,11 @@ struct dma_fence *__i915_vma_evict(struct i915_vma *vma, bool async) 
		/* release the fence reg _after_ flushing */

		i915_vma_revoke_fence(vma);



		__i915_vma_iounmap(vma);

		clear_bit(I915_VMA_CAN_FENCE_BIT, __i915_vma_flags(vma));

	}



	__i915_vma_iounmap(vma);



	GEM_BUG_ON(vma->fence);

	GEM_BUG_ON(i915_vma_has_userfault(vma));