drm/amdgpu/discovery: add SMU 14 support

add smu 14 into the IP discovery list.

Signed-off-by: Li Ma <li.ma@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 9f26d7993303b01da81ca09ace4416378811f0ae..058d9dc672bfb4255bb0e6c000c6b1e72bde3e25 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -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",

diff --git a/drivers/gpu/drm/amd/include/kgd_pp_interface.h b/drivers/gpu/drm/amd/include/kgd_pp_interface.h
index eeb547d79eacd79a68ae61410f7b1561f84f7437..1d4620322a15a7a27cd0bb3fc00af1a05abb2665 100644 (file)
--- a/drivers/gpu/drm/amd/include/kgd_pp_interface.h
+++ b/drivers/gpu/drm/amd/include/kgd_pp_interface.h
@@ -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,

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index da6f018aff120841d04526b92f3a274027a738bd..0b4f9f2ca529f67ef83825d8a116e177fc1d0708 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -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;