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: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index b46a796e06f6d2aac647b9e4853f73b9738dc073..f932fa61ba8bebe8edc0b9c62e0a4eaab728b35f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -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,

diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c
index e5e5d68a4d702a2e2b9df53ecb8ad141abda254f..60f219de833227322ca49ff6777da285d83e2fdd 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc21.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
@@ -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,