drm/amdgpu: add support for SMU IP version 14.0.5

This initializes SMU IP version 14.0.5.

Signed-off-by: Tim Huang <tim.huang@amd.com>
Reviewed-by: Yifan Zhang <yifan1.zhang@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 49d3d017c6578dfdc0e72659baf66f3517bf4313..60c34027454349de0f09551fe415d3c6474d8eea 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -2088,6 +2088,7 @@ static int amdgpu_discovery_set_smu_ip_blocks(struct amdgpu_device *adev)
        case IP_VERSION(14, 0, 2):
        case IP_VERSION(14, 0, 3):
        case IP_VERSION(14, 0, 4):
+       case IP_VERSION(14, 0, 5):
                amdgpu_device_ip_block_add(adev, &smu_v14_0_ip_block);
                break;
        default:

diff --git a/drivers/gpu/drm/amd/amdgpu/soc21.c b/drivers/gpu/drm/amd/amdgpu/soc21.c
index 2e86c730d19280b1a1c5b951eeeda8d6d7736766..a302f1ae6282cfbd81ae1f467a3e13d574b4d636 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/soc21.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc21.c
@@ -390,6 +390,7 @@ soc21_asic_reset_method(struct amdgpu_device *adev)
        case IP_VERSION(14, 0, 0):
        case IP_VERSION(14, 0, 1):
        case IP_VERSION(14, 0, 4):
+       case IP_VERSION(14, 0, 5):
                return AMD_RESET_METHOD_MODE2;
        default:
                if (amdgpu_dpm_is_baco_supported(adev))

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index ed9dac00ebfb1805a5ab93e00f39ce7e6913a26f..167839f4dd2f7b5f30fcf785e0709df83d57c52d 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -739,6 +739,7 @@ static int smu_set_funcs(struct amdgpu_device *adev)
        case IP_VERSION(14, 0, 0):
        case IP_VERSION(14, 0, 1):
        case IP_VERSION(14, 0, 4):
+       case IP_VERSION(14, 0, 5):
                smu_v14_0_0_set_ppt_funcs(smu);
                break;
        case IP_VERSION(14, 0, 2):

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
index 9b2f4fe1578b8db32d8cf5db0768d3d80461c1e9..adbb6332376ecec7228ebe12a2dd9c926bb9338f 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
@@ -245,6 +245,7 @@ int smu_v14_0_check_fw_version(struct smu_context *smu)
        switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) {
        case IP_VERSION(14, 0, 0):
        case IP_VERSION(14, 0, 4):
+       case IP_VERSION(14, 0, 5):
                smu->smc_driver_if_version = SMU14_DRIVER_IF_VERSION_SMU_V14_0_0;
                break;
        case IP_VERSION(14, 0, 1):
@@ -769,6 +770,7 @@ int smu_v14_0_gfx_off_control(struct smu_context *smu, bool enable)
        case IP_VERSION(14, 0, 2):
        case IP_VERSION(14, 0, 3):
        case IP_VERSION(14, 0, 4):
+       case IP_VERSION(14, 0, 5):
                if (!(adev->pm.pp_feature & PP_GFXOFF_MASK))
                        return 0;
                if (enable)