drm/amd/pm: correct the pmfw version check for Navi14
authorEvan Quan <evan.quan@amd.com>
Fri, 18 Sep 2020 03:34:17 +0000 (11:34 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 22 Sep 2020 21:37:38 +0000 (17:37 -0400)
Otherwise, that will be always true for Navi14.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c

index 985c706..1695b36 100644 (file)
@@ -2279,13 +2279,14 @@ static int navi10_run_umc_cdr_workaround(struct smu_context *smu)
        }
 
        /*
-        * The messages below are only supported by 42.53.0 and later
-        * PMFWs.
+        * The messages below are only supported by Navi10 42.53.0 and later
+        * PMFWs and Navi14 53.29.0 and later PMFWs.
         * - PPSMC_MSG_SetDriverDummyTableDramAddrHigh
         * - PPSMC_MSG_SetDriverDummyTableDramAddrLow
         * - PPSMC_MSG_GetUMCFWWA
         */
-       if (pmfw_version >= 0x2a3500) {
+       if (((adev->asic_type == CHIP_NAVI10) && (pmfw_version >= 0x2a3500)) ||
+           ((adev->asic_type == CHIP_NAVI14) && (pmfw_version >= 0x351D00))) {
                ret = smu_cmn_send_smc_msg_with_param(smu,
                                                      SMU_MSG_GET_UMC_FW_WA,
                                                      0,