Commit 36f3f375 authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Use nbio callback for nv and soc21 



Make the new ascis to follow nbio callback method to get pcie replay
count.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 25e6373a

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

+1 −11
Original line number Diff line number Diff line
@@ -572,16 +572,6 @@ static bool nv_need_reset_on_init(struct amdgpu_device *adev) 
	return false;

}



static uint64_t nv_get_pcie_replay_count(struct amdgpu_device *adev)

{



	/* TODO

	 * dummy implement for pcie_replay_count sysfs interface

	 * */



	return 0;

}



static void nv_init_doorbell_index(struct amdgpu_device *adev)

{

	adev->doorbell_index.kiq = AMDGPU_NAVI10_DOORBELL_KIQ;
@@ -656,7 +646,7 @@ static const struct amdgpu_asic_funcs nv_asic_funcs = 
	.init_doorbell_index = &nv_init_doorbell_index,

	.need_full_reset = &nv_need_full_reset,

	.need_reset_on_init = &nv_need_reset_on_init,

	.get_pcie_replay_count = &nv_get_pcie_replay_count,

	.get_pcie_replay_count = &amdgpu_nbio_get_pcie_replay_count,

	.supports_baco = &amdgpu_dpm_is_baco_supported,

	.pre_asic_init = &nv_pre_asic_init,

	.update_umd_stable_pstate = &nv_update_umd_stable_pstate,

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

+1 −11
Original line number Diff line number Diff line
@@ -484,16 +484,6 @@ static bool soc21_need_reset_on_init(struct amdgpu_device *adev) 
	return false;

}



static uint64_t soc21_get_pcie_replay_count(struct amdgpu_device *adev)

{



	/* TODO

	 * dummy implement for pcie_replay_count sysfs interface

	 * */



	return 0;

}



static void soc21_init_doorbell_index(struct amdgpu_device *adev)

{

	adev->doorbell_index.kiq = AMDGPU_NAVI10_DOORBELL_KIQ;
@@ -561,7 +551,7 @@ static const struct amdgpu_asic_funcs soc21_asic_funcs = 
	.init_doorbell_index = &soc21_init_doorbell_index,

	.need_full_reset = &soc21_need_full_reset,

	.need_reset_on_init = &soc21_need_reset_on_init,

	.get_pcie_replay_count = &soc21_get_pcie_replay_count,

	.get_pcie_replay_count = &amdgpu_nbio_get_pcie_replay_count,

	.supports_baco = &amdgpu_dpm_is_baco_supported,

	.pre_asic_init = &soc21_pre_asic_init,

	.query_video_codecs = &soc21_query_video_codecs,