drm/amd/pm: Add support for MP1 13.0.8

Set smu sw function and enable swSMU support for MP1.

Signed-off-by: Prike Liang <Prike.Liang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@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 30fb2f69b87d552ffb3b886d14e0b80aff7fe5b3..150e493a76b14ebf80765e7598b41c8acaff0544 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -1337,6 +1337,7 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct amdgpu_device *adev)
        case IP_VERSION(13, 0, 1):
        case IP_VERSION(13, 0, 2):
        case IP_VERSION(13, 0, 3):
+       case IP_VERSION(13, 0, 8):
                amdgpu_device_ip_block_add(adev, &smu_v13_0_ip_block);
                break;
        default:

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 6535cf336fa5b3da27d37ed877b5cccc81cc32d9..cd22f15e870780461d461bea32fb444a191497b5 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -532,6 +532,7 @@ static int smu_set_funcs(struct amdgpu_device *adev)
                break;
        case IP_VERSION(13, 0, 1):
        case IP_VERSION(13, 0, 3):
+       case IP_VERSION(13, 0, 8):
                yellow_carp_set_ppt_funcs(smu);
                break;
        case IP_VERSION(11, 0, 8):

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 f0ab1dc3ca59fe1849f12e96d825de5c51ae2fdd..df6cbb7feef736015cbac9b23b6c43b93556ac8e 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
@@ -218,6 +218,7 @@ int smu_v13_0_check_fw_version(struct smu_context *smu)
                break;
        case IP_VERSION(13, 0, 1):
        case IP_VERSION(13, 0, 3):
+       case IP_VERSION(13, 0, 8):
                smu->smc_driver_if_version = SMU13_DRIVER_IF_VERSION_YELLOW_CARP;
                break;
        default:

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
index ea6c2dab5ecc014ef20906b24dc1dfca2e8ed6d3..e9d4b82755dd42010d9e990ccefd1160e5b6316a 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
@@ -568,6 +568,7 @@ int smu_cmn_get_enabled_mask(struct smu_context *smu,
        case IP_VERSION(11, 5, 0):
        case IP_VERSION(13, 0, 1):
        case IP_VERSION(13, 0, 3):
+       case IP_VERSION(13, 0, 8):
                ret = smu_cmn_send_smc_msg_with_param(smu,
                                                      SMU_MSG_GetEnabledSmuFeatures,
                                                      0,