Commit 642c0401 authored by YiPeng Chai's avatar YiPeng Chai Committed by Alex Deucher
Browse files

drm/amdgpu: Fixed ras warning when uninstalling amdgpu 



  For the asic using smu v13_0_2, there is the following
warning when uninstalling amdgpu:
  amdgpu: ras disable gfx failed poison:1 ret:-22.

[Why]:
  For the asic using smu v13_0_2, the psp .suspend and
  mode1reset is called before amdgpu_ras_pre_fini during
  amdgpu uninstall, it has disabled all ras features and
  reset the psp. Since the psp is reset, calling
  amdgpu_ras_disable_all_features in amdgpu_ras_pre_fini
  to disable ras features will fail.

[How]:
  If all ras features are disabled, amdgpu_ras_disable_all_features
  will not be called to disable all ras features again.

Signed-off-by: default avatarYiPeng Chai <YiPeng.Chai@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7c32d4e3

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

+2 −1
Original line number Diff line number Diff line
@@ -2720,6 +2720,7 @@ int amdgpu_ras_pre_fini(struct amdgpu_device *adev) 




	/* Need disable ras on all IPs here before ip [hw/sw]fini */

	if (con->features)

		amdgpu_ras_disable_all_features(adev, 0);

	amdgpu_ras_recovery_fini(adev);

	return 0;