Commit 4a0165f0 authored Dec 15, 2021 by Victor Skvortsov Committed by Alex Deucher Dec 28, 2021

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>

parent 4aa325ae

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -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 *)

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -914,12 +914,6 @@ static int gmc_v10_0_sw_init(void *handle)
		return r;
		}

		if (adev->gmc.xgmi.supported) {
		r = adev->gfxhub.funcs->get_xgmi_info(adev);
		if (r)
		return r;
		}

		r = gmc_v10_0_mc_init(adev);
		if (r)
		return r;

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

+0 −6

Original line number	Diff line number	Diff line
		@@ -1628,12 +1628,6 @@ static int gmc_v9_0_sw_init(void *handle)
		}
		adev->need_swiotlb = drm_need_swiotlb(44);

		if (adev->gmc.xgmi.supported) {
		r = adev->gfxhub.funcs->get_xgmi_info(adev);
		if (r)
		return r;
		}

		r = gmc_v9_0_mc_init(adev);
		if (r)
		return r;