Commit 8c9eb6ce authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Deprecate xgmi_link_speed enum 



xgmi doesn't have discrete max speeds defined. Speed numbers can be
arbitrary based on SOC. Deprecate the enum.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 04141c05

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

+4 −2
Original line number Diff line number Diff line
@@ -1771,13 +1771,15 @@ void amdgpu_xgmi_early_init(struct amdgpu_device *adev) 
	case IP_VERSION(9, 4, 0):

	case IP_VERSION(9, 4, 1):

	case IP_VERSION(9, 4, 2):

		adev->gmc.xgmi.max_speed = XGMI_SPEED_25GT;

		/* 25 GT/s */

		adev->gmc.xgmi.max_speed = 25;

		adev->gmc.xgmi.max_width = 16;

		break;

	case IP_VERSION(9, 4, 3):

	case IP_VERSION(9, 4, 4):

	case IP_VERSION(9, 5, 0):

		adev->gmc.xgmi.max_speed = XGMI_SPEED_32GT;

		/* 32 GT/s */

		adev->gmc.xgmi.max_speed = 32;

		adev->gmc.xgmi.max_width = 16;

		break;

	default:

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

+1 −7
Original line number Diff line number Diff line
@@ -25,12 +25,6 @@ 
#include <drm/task_barrier.h>

#include "amdgpu_ras.h"



enum amdgpu_xgmi_link_speed {

	XGMI_SPEED_16GT = 16,

	XGMI_SPEED_25GT = 25,

	XGMI_SPEED_32GT = 32

};



struct amdgpu_hive_info {

	struct kobject kobj;

	uint64_t hive_id;
@@ -97,7 +91,7 @@ struct amdgpu_xgmi { 
	struct ras_common_if *ras_if;

	bool connected_to_cpu;

	struct amdgpu_xgmi_ras *ras;

	enum amdgpu_xgmi_link_speed max_speed;

	uint16_t max_speed;

	uint8_t max_width;

};