drm/amdgpu: add smu 13 support for smu 13.0.11

commit 51e7a2168769c2f46edd93a18d4cba4a6d4adb13 upstream.

this patch to add smu 13 support for smu 13.0.11.

Signed-off-by: Yifan Zhang <yifan1.zhang@amd.com>
Reviewed-by: Aaron Liu <aaron.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: "Limonciello, Mario" <Mario.Limonciello@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 587b4f2..a9f0780 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1689,6 +1689,7 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct amdgpu_device *adev)
        case IP_VERSION(13, 0, 7):
        case IP_VERSION(13, 0, 8):
        case IP_VERSION(13, 0, 10):
+       case IP_VERSION(13, 0, 11):
                amdgpu_device_ip_block_add(adev, &smu_v13_0_ip_block);
                break;
        default:

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
index 9f9f64c..cd37bac 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
@@ -250,6 +250,7 @@ int smu_v13_0_check_fw_status(struct smu_context *smu)
 
        switch (adev->ip_versions[MP1_HWIP][0]) {
        case IP_VERSION(13, 0, 4):
+       case IP_VERSION(13, 0, 11):
                mp1_fw_flags = RREG32_PCIE(MP1_Public |
                                           (smnMP1_V13_0_4_FIRMWARE_FLAGS & 0xffffffff));
                break;
@@ -303,6 +304,7 @@ int smu_v13_0_check_fw_version(struct smu_context *smu)
                smu->smc_driver_if_version = SMU13_DRIVER_IF_VERSION_YELLOW_CARP;
                break;
        case IP_VERSION(13, 0, 4):
+       case IP_VERSION(13, 0, 11):
                smu->smc_driver_if_version = SMU13_DRIVER_IF_VERSION_SMU_V13_0_4;
                break;
        case IP_VERSION(13, 0, 5):