Commit ad3e54ab authored by Li Ma's avatar Li Ma Committed by Alex Deucher
Browse files

drm/amdgpu/discovery: add SMU 14 support 



add smu 14 into the IP discovery list.

Signed-off-by: default avatarLi Ma <li.ma@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fe6cd915

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

+3 −0
Original line number Diff line number Diff line
@@ -1846,6 +1846,9 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct amdgpu_device *adev) 
	case IP_VERSION(13, 0, 11):

		amdgpu_device_ip_block_add(adev, &smu_v13_0_ip_block);

		break;

	case IP_VERSION(14, 0, 0):

		amdgpu_device_ip_block_add(adev, &smu_v14_0_ip_block);

		break;

	default:

		dev_err(adev->dev,

			"Failed to add smu ip block(MP1_HWIP:0x%x)\n",

drivers/gpu/drm/amd/include/kgd_pp_interface.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ extern const struct amdgpu_ip_block_version pp_smu_ip_block; 
extern const struct amdgpu_ip_block_version smu_v11_0_ip_block;

extern const struct amdgpu_ip_block_version smu_v12_0_ip_block;

extern const struct amdgpu_ip_block_version smu_v13_0_ip_block;

extern const struct amdgpu_ip_block_version smu_v14_0_ip_block;



enum smu_event_type {

	SMU_EVENT_RESET_COMPLETE = 0,

drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c

+8 −0
Original line number Diff line number Diff line
@@ -2268,6 +2268,14 @@ const struct amdgpu_ip_block_version smu_v13_0_ip_block = { 
	.funcs = &smu_ip_funcs,

};



const struct amdgpu_ip_block_version smu_v14_0_ip_block = {

	.type = AMD_IP_BLOCK_TYPE_SMC,

	.major = 14,

	.minor = 0,

	.rev = 0,

	.funcs = &smu_ip_funcs,

};



static int smu_load_microcode(void *handle)

{

	struct smu_context *smu = handle;