Commit 41cc07cf authored by Trigger Huang's avatar Trigger Huang Committed by Alex Deucher
Browse files

drm/amdgpu: don't finish the ring if not initialized 



If a ring is not initialized, it also should not be finished.
For example, in Vega10's SR-IOV environment, UVD's decode ring is not
initialized, but will be finnished in amdgpu_uvd_sw_fini, because UVD
driver put all the uvd decode ring's finish operation into
amdgpu_uvd_sw_fini function, while not uvd_vXXX_0_sw_fini. This will
lead to amdgpu module unloading failure.

Signed-off-by: default avatarTrigger Huang <trigger.huang@amd.com>
Reviewed-by: default avatarMonk Liu <monk.liu@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5dcd3345

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

+4 −0
Original line number Diff line number Diff line
@@ -261,6 +261,10 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring) 
{

	ring->ready = false;



	/* Not to finish a ring which is not initialized */

	if (!(ring->adev) || !(ring->adev->rings[ring->idx]))

		return;



	amdgpu_wb_free(ring->adev, ring->rptr_offs);

	amdgpu_wb_free(ring->adev, ring->wptr_offs);