Commit 7838fb5f authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu: fix a memory leak in fence cleanup when unloading 



Commit b61badd2 ("drm/amdgpu: fix usage slab after free")
reordered when amdgpu_fence_driver_sw_fini() was called after
that patch, amdgpu_fence_driver_sw_fini() effectively became
a no-op as the sched entities we never freed because the
ring pointers were already set to NULL.  Remove the NULL
setting.

Reported-by: default avatarLin.Cao <lincao12@amd.com>
Cc: Vitaly Prosyak <vitaly.prosyak@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Fixes: b61badd2 ("drm/amdgpu: fix usage slab after free")
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
(cherry picked from commit a525fa37)
Cc: stable@vger.kernel.org
parent 53503556

drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c

+0 −2
Original line number Diff line number Diff line
@@ -421,8 +421,6 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring) 
	dma_fence_put(ring->vmid_wait);

	ring->vmid_wait = NULL;

	ring->me = 0;



	ring->adev->rings[ring->idx] = NULL;

}



/**