Commit 232d1d43 authored by Stanley.Yang's avatar Stanley.Yang Committed by Alex Deucher
Browse files

drm/amdgpu: fix disable ras feature failed when unload drvier v2 



v2:
    still need call ras_disable_all_featrures to handle
    ras initilization failure case.

Function amdgpu_device_fini_hw is called before amdgpu_device_fini_sw,
so ras ta will unload before send ras disable command, ras dsiable operation
must before hw fini.

Signed-off-by: default avatarStanley.Yang <Stanley.Yang@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 85c1b9bd

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

+3 −2
Original line number Diff line number Diff line
@@ -2733,8 +2733,6 @@ static int amdgpu_device_ip_fini(struct amdgpu_device *adev) 
	if (amdgpu_sriov_vf(adev) && adev->virt.ras_init_done)

		amdgpu_virt_release_ras_err_handler_data(adev);



	amdgpu_ras_pre_fini(adev);



	if (adev->gmc.xgmi.num_physical_nodes > 1)

		amdgpu_xgmi_remove_device(adev);
@@ -3844,6 +3842,9 @@ void amdgpu_device_fini_hw(struct amdgpu_device *adev) 
		amdgpu_ucode_sysfs_fini(adev);

	sysfs_remove_files(&adev->dev->kobj, amdgpu_dev_attributes);



	/* disable ras feature must before hw fini */

	amdgpu_ras_pre_fini(adev);



	amdgpu_device_ip_fini_early(adev);



	amdgpu_irq_fini_hw(adev);

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

+0 −1
Original line number Diff line number Diff line
@@ -2503,7 +2503,6 @@ void amdgpu_ras_late_fini(struct amdgpu_device *adev, 
	amdgpu_ras_sysfs_remove(adev, ras_block);

	if (ih_info->cb)

		amdgpu_ras_interrupt_remove_handler(adev, ih_info);

	amdgpu_ras_feature_enable(adev, ras_block, 0);

}



/* do some init work after IP late init as dependence.