diff options
author | Victor Skvortsov <victor.skvortsov@amd.com> | 2021-12-15 18:42:44 +0000 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2021-12-28 16:02:17 -0500 |
commit | 4a0165f0603f333c6b36a420b4e348b67ddf6fc8 (patch) | |
tree | 9fb80b316c3cf5d806a16fe8086ca99f90f2562f /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
parent | 4aa325ae541378166b3a84186bc1157a1d524f8b (diff) | |
download | linux-4a0165f0603f333c6b36a420b4e348b67ddf6fc8.tar.bz2 |
drm/amdgpu: get xgmi info before ip_init
Driver needs to call get_xgmi_info() before ip_init
to determine whether it needs to handle a pending hive reset.
Signed-off-by: Victor Skvortsov <victor.skvortsov@amd.com>
Reviewed-by: David Nieto <david.nieto@amd.com>
Reviewed by: shaoyun.liu <Shaoyun.lui@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 0cd2404ca63c..ce820ee2e2e6 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3577,6 +3577,13 @@ int amdgpu_device_init(struct amdgpu_device *adev, if (r) return r; + /* Need to get xgmi info early to decide the reset behavior*/ + if (adev->gmc.xgmi.supported) { + r = adev->gfxhub.funcs->get_xgmi_info(adev); + if (r) + return r; + } + /* enable PCIE atomic ops */ if (amdgpu_sriov_vf(adev)) adev->have_atomics_support = ((struct amd_sriov_msg_pf2vf_info *) |