[PATCH] drm/amd/pm: Use VBIOS PPTable for aldebaran

[Lazar, Lijo]

[AMD Public Use]

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

Signed-off-by: Lijo Lazar lijo.lazar at amd.com<mailto:lijo.lazar at amd.com>
---
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 3 +++
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c     | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)

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 abe80226a0ee..af6e0ce9b6a7 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
@@ -407,6 +407,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 30c9ac635105..0864083e7435 100644
--- 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;
--
2.17.1
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20210412/ee13abe9/attachment-0001.htm>