Commit 030308fc authored by Monk Liu's avatar Monk Liu Committed by Alex Deucher
Browse files

drm/amdgpu/sriov:fix page fault issue of driver unload 



bo_free on csa is too late to put in amdgpu_fini because that
time ttm is already finished,
Move it earlier to avoid the page fault.

Signed-off-by: default avatarMonk Liu <Monk.Liu@amd.com>
Signed-off-by: default avatarHorace Chen <horace.chen@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6e2e216f

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

+1 −3
Original line number Diff line number Diff line
@@ -1790,10 +1790,8 @@ static int amdgpu_fini(struct amdgpu_device *adev) 
		adev->ip_blocks[i].status.late_initialized = false;

	}



	if (amdgpu_sriov_vf(adev)) {

		amdgpu_bo_free_kernel(&adev->virt.csa_obj, &adev->virt.csa_vmid0_addr, NULL);

	if (amdgpu_sriov_vf(adev))

		amdgpu_virt_release_full_gpu(adev, false);

	}



	return 0;

}

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

+1 −0
Original line number Diff line number Diff line
@@ -2113,6 +2113,7 @@ static int gfx_v8_0_sw_fini(void *handle) 
	amdgpu_gfx_compute_mqd_sw_fini(adev);

	amdgpu_gfx_kiq_free_ring(&adev->gfx.kiq.ring, &adev->gfx.kiq.irq);

	amdgpu_gfx_kiq_fini(adev);

	amdgpu_bo_free_kernel(&adev->virt.csa_obj, &adev->virt.csa_vmid0_addr, NULL);



	gfx_v8_0_mec_fini(adev);

	gfx_v8_0_rlc_fini(adev);

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

+1 −0
Original line number Diff line number Diff line
@@ -1425,6 +1425,7 @@ static int gfx_v9_0_sw_fini(void *handle) 
	amdgpu_gfx_compute_mqd_sw_fini(adev);

	amdgpu_gfx_kiq_free_ring(&adev->gfx.kiq.ring, &adev->gfx.kiq.irq);

	amdgpu_gfx_kiq_fini(adev);

	amdgpu_bo_free_kernel(&adev->virt.csa_obj, &adev->virt.csa_vmid0_addr, NULL);



	gfx_v9_0_mec_fini(adev);

	gfx_v9_0_ngg_fini(adev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE