Commit 19744f5f authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: move get_xgmi_relative_phy_addr to amdgpu_xgmi.c 



centralize all the xgmi related function to amdgpu_xgmi.c

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Acked-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 53e0f1e6

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

+4 −16
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "amdgpu.h"

#include "amdgpu_ras.h"

#include "amdgpu_atomfirmware.h"

#include "amdgpu_xgmi.h"

#include "ivsrcid/nbio/irqsrcs_nbif_7_4.h"



const char *ras_error_string[] = {
@@ -742,20 +743,6 @@ int amdgpu_ras_error_query(struct amdgpu_device *adev, 
	return 0;

}



uint64_t get_xgmi_relative_phy_addr(struct amdgpu_device *adev, uint64_t addr)

{

	uint32_t df_inst_id;



	if ((!adev->df.funcs)                 ||

	    (!adev->df.funcs->get_df_inst_id) ||

	    (!adev->df.funcs->get_dram_base_addr))

		return addr;



	df_inst_id = adev->df.funcs->get_df_inst_id(adev);



	return addr + adev->df.funcs->get_dram_base_addr(adev, df_inst_id);

}



/* wrapper of psp_ras_trigger_error */

int amdgpu_ras_error_inject(struct amdgpu_device *adev,

		struct ras_inject_if *info)
@@ -775,7 +762,8 @@ int amdgpu_ras_error_inject(struct amdgpu_device *adev, 


	/* Calculate XGMI relative offset */

	if (adev->gmc.xgmi.num_physical_nodes > 1) {

		block_info.address = get_xgmi_relative_phy_addr(adev,

		block_info.address =

			amdgpu_xgmi_get_relative_phy_addr(adev,

							  block_info.address);

	}

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

+15 −0
Original line number Diff line number Diff line
@@ -530,3 +530,18 @@ void amdgpu_xgmi_ras_fini(struct amdgpu_device *adev) 
		kfree(ras_if);

	}

}



uint64_t amdgpu_xgmi_get_relative_phy_addr(struct amdgpu_device *adev,

					   uint64_t addr)

{

	uint32_t df_inst_id;



	if ((!adev->df.funcs)                 ||

	    (!adev->df.funcs->get_df_inst_id) ||

	    (!adev->df.funcs->get_dram_base_addr))

		return addr;



	df_inst_id = adev->df.funcs->get_df_inst_id(adev);



	return addr + adev->df.funcs->get_dram_base_addr(adev, df_inst_id);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -46,6 +46,8 @@ 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);

uint64_t amdgpu_xgmi_get_relative_phy_addr(struct amdgpu_device *adev,

					   uint64_t addr);



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