drm/amd/pm: Update SMU v13.0.6 PPT caps initialization

Update the conditions for setting the SMU vcn reset caps in the SMU v13.0.6 PPT
initialization function. Specifically:

- Add support for VCN reset capability for firmware versions 0x00558200 and
  above when the program version is 0.
- Add support for VCN reset capability for firmware versions 0x05551800 and
  above when the program version is 5.

v2: correct the smu mp1 version for program 5 (Lijo)

Suggested-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Jesse Zhang <Jesse.Zhang@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Yang Wang <kevinyang.wang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
index d65c912d2408c61158481c9cb3bcce5eaf3c5c16..fe2d48dc47afaecf88ad3dd51b766abb4b85ab23 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
@@ -312,6 +312,8 @@ static void smu_v13_0_14_init_caps(struct smu_context *smu)
                smu_v13_0_6_cap_set(smu, SMU_CAP(PER_INST_METRICS));
        if (fw_ver >= 0x5551200)
                smu_v13_0_6_cap_set(smu, SMU_CAP(SDMA_RESET));
+       if (fw_ver >= 0x5551800)
+               smu_v13_0_6_cap_set(smu, SMU_CAP(VCN_RESET));
        if (fw_ver >= 0x5551600) {
                smu_v13_0_6_cap_set(smu, SMU_CAP(STATIC_METRICS));
                smu_v13_0_6_cap_set(smu, SMU_CAP(BOARD_VOLTAGE));
@@ -437,7 +439,8 @@ static void smu_v13_0_6_init_caps(struct smu_context *smu)
            ((pgm == 4) && (fw_ver >= 0x4557000)))
                smu_v13_0_6_cap_set(smu, SMU_CAP(SDMA_RESET));
 
-       if ((pgm == 4) && (fw_ver >= 0x04557100))
+       if (((pgm == 0) && (fw_ver >= 0x00558200)) ||
+           ((pgm == 4) && (fw_ver >= 0x04557100)))
                smu_v13_0_6_cap_set(smu, SMU_CAP(VCN_RESET));
 }