[PATCH 1/3] drm/amdgpu: add smu 14.0.1 support

[Zhang, Yifan]

[AMD Official Use Only - General]

I think it is intentional re-use of smu 14.0.0 interface and will be updated later.

Best Regards,
Yifan

-----Original Message-----
From: Wang, Yang(Kevin) <KevinYang.Wang at amd.com>
Sent: Wednesday, March 6, 2024 11:09 AM
To: Deucher, Alexander <Alexander.Deucher at amd.com>; amd-gfx at lists.freedesktop.org
Cc: Zhang, Yifan <Yifan1.Zhang at amd.com>; Deucher, Alexander <Alexander.Deucher at amd.com>
Subject: RE: [PATCH 1/3] drm/amdgpu: add smu 14.0.1 support

[AMD Official Use Only - General]

-----Original Message-----
From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Alex Deucher
Sent: Tuesday, March 5, 2024 11:25 PM
To: amd-gfx at lists.freedesktop.org
Cc: Zhang, Yifan <Yifan1.Zhang at amd.com>; Deucher, Alexander <Alexander.Deucher at amd.com>
Subject: [PATCH 1/3] drm/amdgpu: add smu 14.0.1 support

From: Yifan Zhang <yifan1.zhang at amd.com>

This patch to add smu 14.0.1 support.

Signed-off-by: Yifan Zhang <yifan1.zhang at amd.com>
Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
---
 drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c      | 2 ++
 drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index eedb9a4f7e2d6..246b211b1e85f 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -712,6 +712,7 @@ static int smu_set_funcs(struct amdgpu_device *adev)
                smu_v13_0_7_set_ppt_funcs(smu);
                break;
        case IP_VERSION(14, 0, 0):
+       case IP_VERSION(14, 0, 1):
                smu_v14_0_0_set_ppt_funcs(smu);
                break;
        default:
@@ -1895,6 +1896,7 @@ static int smu_disable_dpms(struct smu_context *smu)
                case IP_VERSION(13, 0, 4):
                case IP_VERSION(13, 0, 11):
                case IP_VERSION(14, 0, 0):
+               case IP_VERSION(14, 0, 1):
                        return 0;
                default:
                        break;
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 7ac9bc0df8fd7..a65c618c2f98e 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
@@ -231,6 +231,10 @@ int smu_v14_0_check_fw_version(struct smu_context *smu)
        case IP_VERSION(14, 0, 0):
                smu->smc_driver_if_version = SMU14_DRIVER_IF_VERSION_SMU_V14_0_0;
                break;
+       case IP_VERSION(14, 0, 1):
+               smu->smc_driver_if_version = SMU14_DRIVER_IF_VERSION_SMU_V14_0_0;
+               break;
[kevin]:

There is a typo or share the same version with 14.0.0 ?

Best Regards,
Kevin
+
        default:
                dev_err(adev->dev, "smu unsupported IP version: 0x%x.\n",
                        amdgpu_ip_version(adev, MP1_HWIP, 0)); @@ -734,6 +738,7 @@ int smu_v14_0_gfx_off_control(struct smu_context *smu, bool enable)
        switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) {
        case IP_VERSION(14, 0, 2):
        case IP_VERSION(14, 0, 0):
+       case IP_VERSION(14, 0, 1):
                if (!(adev->pm.pp_feature & PP_GFXOFF_MASK))
                        return 0;
                if (enable)
--
2.44.0