Commit 957b0787 authored by Yifan Zhang's avatar Yifan Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: move amdgpu_gmc_noretry_set after ip_versions populated 



otherwise adev->ip_versions is still empty when amdgpu_gmc_noretry_set
is called.

Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarYifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 80e0c2cb

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

+1 −1
Original line number Diff line number Diff line
@@ -1554,7 +1554,6 @@ static int amdgpu_device_check_arguments(struct amdgpu_device *adev) 


	amdgpu_gmc_tmz_set(adev);



	amdgpu_gmc_noretry_set(adev);



	return 0;

}
@@ -3711,6 +3710,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	if (r)

		return r;



	amdgpu_gmc_noretry_set(adev);

	/* Need to get xgmi info early to decide the reset behavior*/

	if (adev->gmc.xgmi.supported) {

		r = adev->gfxhub.funcs->get_xgmi_info(adev);