drm/amd/pm: change the soft pptable id for smu_v13_0_7
authorKenneth Feng <kenneth.feng@amd.com>
Mon, 25 Apr 2022 13:39:30 +0000 (21:39 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 6 May 2022 14:36:12 +0000 (10:36 -0400)
change the soft pptable id for smu_v13_0_7 according to pptable updatde

Signed-off-by: Kenneth Feng <kenneth.feng@amd.com>
Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c

index 65ff98a..2c57bc5 100644 (file)
@@ -210,6 +210,13 @@ int smu_v13_0_init_pptable_microcode(struct smu_context *smu)
        } else {
                pptable_id = smu->smu_table.boot_values.pp_table_id;
 
+               if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 7) &&
+                       pptable_id == 3667)
+                       pptable_id = 36671;
+
+               if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 7) &&
+                       pptable_id == 3688)
+                       pptable_id = 36881;
                /*
                 * Temporary solution for SMU V13.0.0:
                 *   - use 99991 signed pptable when SCPM enabled
@@ -445,9 +452,6 @@ int smu_v13_0_setup_pptable(struct smu_context *smu)
                 */
                if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 0))
                        pptable_id = 9999;
-
-               if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 7))
-                       pptable_id = 8888;
        }
 
        /* force using vbios pptable in sriov mode */