drm/amd/pm: Use VBIOS PPTable for aldebaran

Keep the logic to force-use VBIOS PPTable in aldebaran rather
than in generic SMU13.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Kevin Wang <kevin1.wang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
index bca02a9fb489eb202adaf227a83d621cac4348dc..7b8b53cc701b32e0aa45962011cb743e9717eb56 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
@@ -405,6 +405,9 @@ static int aldebaran_setup_pptable(struct smu_context *smu)
 {
        int ret = 0;
 
+       /* VBIOS pptable is the first choice */
+       smu->smu_table.boot_values.pp_table_id = 0;
+
        ret = smu_v13_0_setup_pptable(smu);
        if (ret)
                return ret;

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 30c9ac635105dba577ceefc97ceab8f60c945005..0864083e7435c38713ffd0f5ddab8db340af430b 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
@@ -276,8 +276,6 @@ int smu_v13_0_setup_pptable(struct smu_context *smu)
        void *table;
        uint16_t version_major, version_minor;
 
-       /* temporarily hardcode to use vbios pptable */
-       smu->smu_table.boot_values.pp_table_id = 0;
 
        if (amdgpu_smu_pptable_id >= 0) {
                smu->smu_table.boot_values.pp_table_id = amdgpu_smu_pptable_id;