Commit c607e76e authored by Asad Kamal's avatar Asad Kamal Committed by Alex Deucher
Browse files

Revert "drm/amdgpu: Add pcie usage callback to nbio" 



pcie usage is now handled by fw

This reverts commit 8d759dc6.

Signed-off-by: default avatarAsad Kamal <asad.kamal@amd.com>
Reviewed-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 1d55183c

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

+0 −8
Original line number Diff line number Diff line
@@ -53,14 +53,6 @@ u64 amdgpu_nbio_get_pcie_replay_count(struct amdgpu_device *adev) 
	return 0;

}



void amdgpu_nbio_get_pcie_usage(struct amdgpu_device *adev, uint64_t *count0,

				uint64_t *count1)

{

	if (adev->nbio.funcs->get_pcie_usage)

		adev->nbio.funcs->get_pcie_usage(adev, count0, count1);



}



int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)

{

	int r;

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

+0 −3
Original line number Diff line number Diff line
@@ -102,8 +102,6 @@ struct amdgpu_nbio_funcs { 
	u32 (*get_memory_partition_mode)(struct amdgpu_device *adev,

					 u32 *supp_modes);

	u64 (*get_pcie_replay_count)(struct amdgpu_device *adev);

	void (*get_pcie_usage)(struct amdgpu_device *adev, uint64_t *count0,

					uint64_t *count1);

};



struct amdgpu_nbio {
@@ -116,7 +114,6 @@ struct amdgpu_nbio { 
};



int amdgpu_nbio_ras_sw_init(struct amdgpu_device *adev);

void amdgpu_nbio_get_pcie_usage(struct amdgpu_device *adev, uint64_t *count0, uint64_t *count1);

int amdgpu_nbio_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block);

u64 amdgpu_nbio_get_pcie_replay_count(struct amdgpu_device *adev);