[PATCH 3/3] drm/amd/pm: Use generic BACO function for smu11 ASICs

[Quan, Evan]

[Public]

Series is reviewed-by: Evan Quan <evan.quan at amd.com>

From: Lazar, Lijo <Lijo.Lazar at amd.com>
Sent: Friday, June 4, 2021 5:12 PM
To: amd-gfx at lists.freedesktop.org
Cc: Zhang, Hawking <Hawking.Zhang at amd.com>; Quan, Evan <Evan.Quan at amd.com>; Feng, Kenneth <Kenneth.Feng at amd.com>
Subject: [PATCH 3/3] drm/amd/pm: Use generic BACO function for smu11 ASICs


[Public]

Remove ASIC specific functions for BACO support check. Use generic smu11
function instead.

Signed-off-by: Lijo Lazar <lijo.lazar at amd.com<mailto:lijo.lazar at amd.com>>
---
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c    | 12 +-----------
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c      | 12 +-----------
.../gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c  | 12 +-----------
3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
index 5c248accc4a6..5959019f51ad 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c
@@ -2162,16 +2162,6 @@ static void arcturus_get_unique_id(struct smu_context *smu)
               sprintf(adev->serial, "%llx", id);
}

-static bool arcturus_is_baco_supported(struct smu_context *smu)
-{
-              struct amdgpu_device *adev = smu->adev;
-
-              if (!smu_v11_0_baco_is_support(smu) || amdgpu_sriov_vf(adev))
-                              return false;
-
-              return true;
-}
-
static int arcturus_set_df_cstate(struct smu_context *smu,
                                                                 enum pp_df_cstate state)
{
@@ -2406,7 +2396,7 @@ static const struct pptable_funcs arcturus_ppt_funcs = {
               .register_irq_handler = smu_v11_0_register_irq_handler,
               .set_azalia_d3_pme = smu_v11_0_set_azalia_d3_pme,
               .get_max_sustainable_clocks_by_dc = smu_v11_0_get_max_sustainable_clocks_by_dc,
-              .baco_is_support= arcturus_is_baco_supported,
+             .baco_is_support = smu_v11_0_baco_is_support,
               .baco_get_state = smu_v11_0_baco_get_state,
               .baco_set_state = smu_v11_0_baco_set_state,
               .baco_enter = smu_v11_0_baco_enter,
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
index 31e9cc3f3ea0..74a8c676e22c 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c
@@ -2257,16 +2257,6 @@ static int navi10_overdrive_get_gfx_clk_base_voltage(struct smu_context *smu,
               return 0;
}

-static bool navi10_is_baco_supported(struct smu_context *smu)
-{
-              struct amdgpu_device *adev = smu->adev;
-
-              if (amdgpu_sriov_vf(adev) || (!smu_v11_0_baco_is_support(smu)))
-                              return false;
-
-              return true;
-}
-
static int navi10_set_default_od_settings(struct smu_context *smu)
{
               OverDriveTable_t *od_table =
@@ -3102,7 +3092,7 @@ static const struct pptable_funcs navi10_ppt_funcs = {
               .register_irq_handler = smu_v11_0_register_irq_handler,
               .set_azalia_d3_pme = smu_v11_0_set_azalia_d3_pme,
               .get_max_sustainable_clocks_by_dc = smu_v11_0_get_max_sustainable_clocks_by_dc,
-              .baco_is_support= navi10_is_baco_supported,
+             .baco_is_support = smu_v11_0_baco_is_support,
               .baco_get_state = smu_v11_0_baco_get_state,
               .baco_set_state = smu_v11_0_baco_set_state,
               .baco_enter = smu_v11_0_baco_enter,
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
index 6614dbb723be..f01e919e1f89 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
@@ -2100,16 +2100,6 @@ static int sienna_cichlid_run_btc(struct smu_context *smu)
               return smu_cmn_send_smc_msg(smu, SMU_MSG_RunDcBtc, NULL);
}

-static bool sienna_cichlid_is_baco_supported(struct smu_context *smu)
-{
-              struct amdgpu_device *adev = smu->adev;
-
-              if (amdgpu_sriov_vf(adev) || (!smu_v11_0_baco_is_support(smu)))
-                              return false;
-
-              return true;
-}
-
static bool sienna_cichlid_is_mode1_reset_supported(struct smu_context *smu)
{
               struct amdgpu_device *adev = smu->adev;
@@ -3882,7 +3872,7 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
               .register_irq_handler = smu_v11_0_register_irq_handler,
               .set_azalia_d3_pme = smu_v11_0_set_azalia_d3_pme,
               .get_max_sustainable_clocks_by_dc = smu_v11_0_get_max_sustainable_clocks_by_dc,
-              .baco_is_support= sienna_cichlid_is_baco_supported,
+             .baco_is_support = smu_v11_0_baco_is_support,
               .baco_get_state = smu_v11_0_baco_get_state,
               .baco_set_state = smu_v11_0_baco_set_state,
               .baco_enter = smu_v11_0_baco_enter,
--
2.17.1

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20210604/5d63bd9f/attachment-0001.htm>