[PATCH AUTOSEL 5.19 25/38] drm/amd/pm: use vbios carried pptable for all SMU13.0.7 SKUs

[Sasha Levin]

From: Evan Quan <evan.q...@amd.com>

[ Upstream commit b023053592646b1da9477b0b598f2cdd5d3f89d8 ]

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

Signed-off-by: Evan Quan <evan.q...@amd.com>
Reviewed-by: Kenneth Feng <kenneth.f...@amd.com>
Signed-off-by: Alex Deucher <alexander.deuc...@amd.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c  | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c 
b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
index 4e1861fb2c6a4..ef811ba1c5a7d 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
@@ -382,11 +382,27 @@ static int smu_v13_0_7_append_powerplay_table(struct 
smu_context *smu)
        return 0;
 }
 
+static int smu_v13_0_7_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_7_powerplay_table);
+
+       return 0;
+}
 
 static int smu_v13_0_7_setup_pptable(struct smu_context *smu)
 {
        struct smu_table_context *smu_table = &smu->smu_table;
-       void *combo_pptable = smu_table->combo_pptable;
        struct amdgpu_device *adev = smu->adev;
        int ret = 0;
 
@@ -395,18 +411,11 @@ static int smu_v13_0_7_setup_pptable(struct smu_context 
*smu)
         * be used directly by driver. To get the raw pptable, we need to
         * 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_7_powerplay_table);
-       } else {
-               ret = smu_v13_0_setup_pptable(smu);
-               if (ret)
-                       return ret;
-       }
+       ret = smu_v13_0_7_get_pptable_from_pmfw(smu,
+                                               &smu_table->power_play_table,
+                                               
&smu_table->power_play_table_size);
+       if (ret)
+               return ret;
 
        ret = smu_v13_0_7_store_powerplay_table(smu);
        if (ret)
-- 
2.35.1