Commit 121a2bc6 authored by Andrey Grodzovsky's avatar Andrey Grodzovsky Committed by Alex Deucher
Browse files

drm/amdgpu: Move amdgpu_ras_recovery_init to after SMU ready. 



For Arcturus the I2C traffic is done through SMU tables and so
we must postpone RAS recovery init to after they are ready
which is in amdgpu_device_ip_hw_init_phase2.

Signed-off-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cf52ecc8

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

+13 −0
Original line number Diff line number Diff line
@@ -1877,6 +1877,19 @@ static int amdgpu_device_ip_init(struct amdgpu_device *adev) 
	if (r)

		goto init_failed;



	/*

	 * retired pages will be loaded from eeprom and reserved here,

	 * it should be called after amdgpu_device_ip_hw_init_phase2  since

	 * for some ASICs the RAS EEPROM code relies on SMU fully functioning

	 * for I2C communication which only true at this point.

	 * recovery_init may fail, but it can free all resources allocated by

	 * itself and its failure should not stop amdgpu init process.

	 *

	 * Note: theoretically, this should be called before all vram allocations

	 * to protect retired page from abusing

	 */

	amdgpu_ras_recovery_init(adev);



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

		amdgpu_xgmi_add_device(adev);

	amdgpu_amdkfd_device_init(adev);

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

+0 −11
Original line number Diff line number Diff line
@@ -1802,17 +1802,6 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
						adev->gmc.visible_vram_size);

#endif



	/*

	 * retired pages will be loaded from eeprom and reserved here,

	 * it should be called after ttm init since new bo may be created,

	 * recovery_init may fail, but it can free all resources allocated by

	 * itself and its failure should not stop amdgpu init process.

	 *

	 * Note: theoretically, this should be called before all vram allocations

	 * to protect retired page from abusing

	 */

	amdgpu_ras_recovery_init(adev);



	/*

	 *The reserved vram for firmware must be pinned to the specified

	 *place on the VRAM, so reserve it early.

CRA Git | Maintained and supported by SUSTech CRA and CCSE