Commit be5b39d8 authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: move xgmi ras fini to xgmi block 



it's more suitable to put xgmi ras fini in xgmi block

Signed-off-by: default avatarTao Zhou <tao.zhou1@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 19604120

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

+2 −11
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


#include "amdgpu.h"

#include "amdgpu_ras.h"

#include "amdgpu_xgmi.h"



/**

 * amdgpu_gmc_get_pde_for_bo - get the PDE for a BO
@@ -311,15 +312,5 @@ void amdgpu_gmc_ras_fini(struct amdgpu_device *adev) 
{

	amdgpu_umc_ras_fini(adev);

	amdgpu_mmhub_ras_fini(adev);



	if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__XGMI_WAFL) &&

			adev->gmc.xgmi.ras_if) {

		struct ras_common_if *ras_if = adev->gmc.xgmi.ras_if;

		struct ras_ih_if ih_info = {

			.cb = NULL,

		};



		amdgpu_ras_late_fini(adev, ras_if, &ih_info);

		kfree(ras_if);

	}

	amdgpu_xgmi_ras_fini(adev);

}

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

+14 −0
Original line number Diff line number Diff line
@@ -473,3 +473,17 @@ int amdgpu_xgmi_ras_late_init(struct amdgpu_device *adev) 


	return r;

}



void amdgpu_xgmi_ras_fini(struct amdgpu_device *adev)

{

	if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__XGMI_WAFL) &&

			adev->gmc.xgmi.ras_if) {

		struct ras_common_if *ras_if = adev->gmc.xgmi.ras_if;

		struct ras_ih_if ih_info = {

			.cb = NULL,

		};



		amdgpu_ras_late_fini(adev, ras_if, &ih_info);

		kfree(ras_if);

	}

}

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

+1 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ int amdgpu_xgmi_set_pstate(struct amdgpu_device *adev, int pstate); 
int amdgpu_xgmi_get_hops_count(struct amdgpu_device *adev,

		struct amdgpu_device *peer_adev);

int amdgpu_xgmi_ras_late_init(struct amdgpu_device *adev);

void amdgpu_xgmi_ras_fini(struct amdgpu_device *adev);



static inline bool amdgpu_xgmi_same_hive(struct amdgpu_device *adev,

		struct amdgpu_device *bo_adev)

CRA Git | Maintained and supported by SUSTech CRA and CCSE