Commit 1f33bd18 authored by yipechai's avatar yipechai Committed by Alex Deucher
Browse files

drm/amdgpu: Move xgmi ras initialization from .late_init to .early_init 



Move xgmi ras initialization from .late_init to .early_init, which let
xgmi ras can be initialized only once.

Signed-off-by: default avataryipechai <YiPeng.Chai@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d6dac2bc

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

+10 −5
Original line number Diff line number Diff line
@@ -436,6 +436,16 @@ void amdgpu_gmc_filter_faults_remove(struct amdgpu_device *adev, uint64_t addr, 
	} while (fault->timestamp < tmp);

}



int amdgpu_gmc_ras_early_init(struct amdgpu_device *adev)

{

	if (!adev->gmc.xgmi.connected_to_cpu) {

		adev->gmc.xgmi.ras = &xgmi_ras;

		amdgpu_ras_register_ras_block(adev, &adev->gmc.xgmi.ras->ras_block);

	}



	return 0;

}



int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev)

{

	int r;
@@ -452,11 +462,6 @@ int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev) 
			return r;

	}



	if (!adev->gmc.xgmi.connected_to_cpu) {

		adev->gmc.xgmi.ras = &xgmi_ras;

		amdgpu_ras_register_ras_block(adev, &adev->gmc.xgmi.ras->ras_block);

	}



	if (adev->gmc.xgmi.ras && adev->gmc.xgmi.ras->ras_block.ras_late_init) {

		r = adev->gmc.xgmi.ras->ras_block.ras_late_init(adev, NULL);

		if (r)

drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h

+1 −0
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ bool amdgpu_gmc_filter_faults(struct amdgpu_device *adev, 
			      uint16_t pasid, uint64_t timestamp);

void amdgpu_gmc_filter_faults_remove(struct amdgpu_device *adev, uint64_t addr,

				     uint16_t pasid);

int amdgpu_gmc_ras_early_init(struct amdgpu_device *adev);

int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev);

void amdgpu_gmc_ras_fini(struct amdgpu_device *adev);

int amdgpu_gmc_allocate_vm_inv_eng(struct amdgpu_device *adev);

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

+5 −0
Original line number Diff line number Diff line
@@ -719,6 +719,7 @@ static void gmc_v10_0_set_gfxhub_funcs(struct amdgpu_device *adev) 


static int gmc_v10_0_early_init(void *handle)

{

	int r;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	gmc_v10_0_set_mmhub_funcs(adev);
@@ -734,6 +735,10 @@ static int gmc_v10_0_early_init(void *handle) 
	adev->gmc.private_aperture_end =

		adev->gmc.private_aperture_start + (4ULL << 30) - 1;



	r = amdgpu_gmc_ras_early_init(adev);

	if (r)

		return r;



	return 0;

}

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

+5 −0
Original line number Diff line number Diff line
@@ -1318,6 +1318,7 @@ static void gmc_v9_0_set_mca_funcs(struct amdgpu_device *adev) 


static int gmc_v9_0_early_init(void *handle)

{

	int r;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	/* ARCT and VEGA20 don't have XGMI defined in their IP discovery tables */
@@ -1347,6 +1348,10 @@ static int gmc_v9_0_early_init(void *handle) 
	adev->gmc.private_aperture_end =

		adev->gmc.private_aperture_start + (4ULL << 30) - 1;



	r = amdgpu_gmc_ras_early_init(adev);

	if (r)

		return r;



	return 0;

}