drm/amd/pm: use vbios carried pptable for those supported SKUs

For some SMU13.0.0 SKUs, the vbios carried pptable is ready to go.
Use that one instead of hardcoded softpptable.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Kenneth Feng <kenneth.feng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
index ac308e7..cf28af9 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h
@@ -291,5 +291,11 @@ int smu_v13_0_set_default_dpm_tables(struct smu_context *smu);
 void smu_v13_0_set_smu_mailbox_registers(struct smu_context *smu);
 
 int smu_v13_0_mode1_reset(struct smu_context *smu);
+
+int smu_v13_0_get_pptable_from_firmware(struct smu_context *smu,
+                                       void **table,
+                                       uint32_t *size,
+                                       uint32_t pptable_id);
+
 #endif
 #endif

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
index 18ee3b5..24488f4 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
@@ -84,9 +84,6 @@ MODULE_FIRMWARE("amdgpu/smu_13_0_7.bin");
 static const int link_width[] = {0, 1, 2, 4, 8, 12, 16};
 static const int link_speed[] = {25, 50, 80, 160};
 
-static int smu_v13_0_get_pptable_from_firmware(struct smu_context *smu, void **table, uint32_t *size,
-                                              uint32_t pptable_id);
-
 int smu_v13_0_init_microcode(struct smu_context *smu)
 {
        struct amdgpu_device *adev = smu->adev;
@@ -224,23 +221,19 @@ int smu_v13_0_init_pptable_microcode(struct smu_context *smu)
 
                /*
                 * Temporary solution for SMU V13.0.0 with SCPM enabled:
-                *   - use 36831 signed pptable when pp_table_id is 3683
-                *   - use 37151 signed pptable when pp_table_id is 3715
-                *   - use 36641 signed pptable when pp_table_id is 3664 or 0
-                * TODO: drop these when the pptable carried in vbios is ready.
+                *   - use vbios carried pptable when pptable_id is 3664, 3715 or 3795
+                *   - use 36831 soft pptable when pptable_id is 3683
                 */
                if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 0)) {
                        switch (pptable_id) {
-                       case 0:
                        case 3664:
-                               pptable_id = 36641;
+                       case 3715:
+                       case 3795:
+                               pptable_id = 0;
                                break;
                        case 3683:
                                pptable_id = 36831;
                                break;
-                       case 3715:
-                               pptable_id = 37151;
-                               break;
                        default:
                                dev_err(adev->dev, "Unsupported pptable id %d\n", pptable_id);
                                return -EINVAL;
@@ -425,8 +418,10 @@ static int smu_v13_0_get_pptable_from_vbios(struct smu_context *smu, void **tabl
        return 0;
 }
 
-static int smu_v13_0_get_pptable_from_firmware(struct smu_context *smu, void **table, uint32_t *size,
-                                              uint32_t pptable_id)
+int smu_v13_0_get_pptable_from_firmware(struct smu_context *smu,
+                                       void **table,
+                                       uint32_t *size,
+                                       uint32_t pptable_id)
 {
        const struct smc_firmware_header_v1_0 *hdr;
        struct amdgpu_device *adev = smu->adev;

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
index df4a47a..7db2fd9 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
@@ -388,11 +388,29 @@ static int smu_v13_0_0_append_powerplay_table(struct smu_context *smu)
        return 0;
 }
 
-static int smu_v13_0_0_setup_pptable(struct smu_context *smu)
+static int smu_v13_0_0_get_pptable_from_pmfw(struct smu_context *smu,
+                                            void **table,
+                                            uint32_t *size)
 {
        struct smu_table_context *smu_table = &smu->smu_table;
        void *combo_pptable = smu_table->combo_pptable;
+       int ret = 0;
+
+       ret = smu_cmn_get_combo_pptable(smu);
+       if (ret)
+               return ret;
+
+       *table = combo_pptable;
+       *size = sizeof(struct smu_13_0_0_powerplay_table);
+
+       return 0;
+}
+
+static int smu_v13_0_0_setup_pptable(struct smu_context *smu)
+{
+       struct smu_table_context *smu_table = &smu->smu_table;
        struct amdgpu_device *adev = smu->adev;
+       uint32_t pptable_id;
        int ret = 0;
 
        /*
@@ -401,17 +419,51 @@ static int smu_v13_0_0_setup_pptable(struct smu_context *smu)
         * rely on the combo pptable(and its revelant SMU message).
         */
        if (adev->scpm_enabled) {
-               ret = smu_cmn_get_combo_pptable(smu);
-               if (ret)
-                       return ret;
-
-               smu->smu_table.power_play_table = combo_pptable;
-               smu->smu_table.power_play_table_size = sizeof(struct smu_13_0_0_powerplay_table);
+               ret = smu_v13_0_0_get_pptable_from_pmfw(smu,
+                                                       &smu_table->power_play_table,
+                                                       &smu_table->power_play_table_size);
        } else {
-               ret = smu_v13_0_setup_pptable(smu);
-               if (ret)
-                       return ret;
+               /* override pptable_id from driver parameter */
+               if (amdgpu_smu_pptable_id >= 0) {
+                       pptable_id = amdgpu_smu_pptable_id;
+                       dev_info(adev->dev, "override pptable id %d\n", pptable_id);
+               } else {
+                       pptable_id = smu_table->boot_values.pp_table_id;
+               }
+
+               /*
+                * Temporary solution for SMU V13.0.0 with SCPM disabled:
+                *   - use vbios carried pptable when pptable_id is 3664, 3715 or 3795
+                *   - use soft pptable when pptable_id is 3683
+                */
+               if (adev->ip_versions[MP1_HWIP][0] == IP_VERSION(13, 0, 0)) {
+                       switch (pptable_id) {
+                       case 3664:
+                       case 3715:
+                       case 3795:
+                               pptable_id = 0;
+                               break;
+                       case 3683:
+                               break;
+                       default:
+                               dev_err(adev->dev, "Unsupported pptable id %d\n", pptable_id);
+                               return -EINVAL;
+                       }
+               }
+
+               /* force using vbios pptable in sriov mode */
+               if ((amdgpu_sriov_vf(adev) || !pptable_id) && (amdgpu_emu_mode != 1))
+                       ret = smu_v13_0_0_get_pptable_from_pmfw(smu,
+                                                               &smu_table->power_play_table,
+                                                               &smu_table->power_play_table_size);
+               else
+                       ret = smu_v13_0_get_pptable_from_firmware(smu,
+                                                                 &smu_table->power_play_table,
+                                                                 &smu_table->power_play_table_size,
+                                                                 pptable_id);
        }
+       if (ret)
+               return ret;
 
        ret = smu_v13_0_0_store_powerplay_table(smu);
        if (ret)