drm/amd/pm: deprecate allow_xgmi_power_down interface

Replace with set_plpd_mode uniformly for places to use.

Signed-off-by: Le Ma <le.ma@amd.com>
Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
index 02770c6..19aa6b7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
@@ -1092,7 +1092,7 @@ static int amdgpu_ras_error_inject_xgmi(struct amdgpu_device *adev,
        if (amdgpu_dpm_set_df_cstate(adev, DF_CSTATE_DISALLOW))
                dev_warn(adev->dev, "Failed to disallow df cstate");
 
-       if (amdgpu_dpm_allow_xgmi_power_down(adev, false))
+       if (amdgpu_dpm_set_xgmi_plpd_mode(adev, XGMI_PLPD_DISALLOW))
                dev_warn(adev->dev, "Failed to disallow XGMI power down");
 
        ret = psp_ras_trigger_error(&adev->psp, block_info, instance_mask);
@@ -1100,7 +1100,7 @@ static int amdgpu_ras_error_inject_xgmi(struct amdgpu_device *adev,
        if (amdgpu_ras_intr_triggered())
                return ret;
 
-       if (amdgpu_dpm_allow_xgmi_power_down(adev, true))
+       if (amdgpu_dpm_set_xgmi_plpd_mode(adev, XGMI_PLPD_DEFAULT))
                dev_warn(adev->dev, "Failed to allow XGMI power down");
 
        if (amdgpu_dpm_set_df_cstate(adev, DF_CSTATE_ALLOW))

diff --git a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c
index 9a157fe..1b17a71 100644 (file)
--- a/drivers/gpu/drm/amd/pm/amdgpu_dpm.c
+++ b/drivers/gpu/drm/amd/pm/amdgpu_dpm.c
@@ -351,20 +351,6 @@ int amdgpu_dpm_set_df_cstate(struct amdgpu_device *adev,
        return ret;
 }
 
-int amdgpu_dpm_allow_xgmi_power_down(struct amdgpu_device *adev, bool en)
-{
-       struct smu_context *smu = adev->powerplay.pp_handle;
-       int ret = 0;
-
-       if (is_support_sw_smu(adev)) {
-               mutex_lock(&adev->pm.mutex);
-               ret = smu_allow_xgmi_power_down(smu, en);
-               mutex_unlock(&adev->pm.mutex);
-       }
-
-       return ret;
-}
-
 int amdgpu_dpm_get_xgmi_plpd_mode(struct amdgpu_device *adev, char **mode_desc)
 {
        struct smu_context *smu = adev->powerplay.pp_handle;

diff --git a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
index 564494f..feccd2a 100644 (file)
--- a/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
+++ b/drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h
@@ -424,8 +424,6 @@ int amdgpu_dpm_baco_enter(struct amdgpu_device *adev);
 int amdgpu_dpm_set_df_cstate(struct amdgpu_device *adev,
                             uint32_t cstate);
 
-int amdgpu_dpm_allow_xgmi_power_down(struct amdgpu_device *adev, bool en);
-
 int amdgpu_dpm_get_xgmi_plpd_mode(struct amdgpu_device *adev,
                                  char **mode);
 

diff --git a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
index 1c6b226..33eaf0d 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c
@@ -2178,23 +2178,6 @@ static int smu_set_df_cstate(void *handle,
        return ret;
 }
 
-int smu_allow_xgmi_power_down(struct smu_context *smu, bool en)
-{
-       int ret = 0;
-
-       if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)
-               return -EOPNOTSUPP;
-
-       if (!smu->ppt_funcs || !smu->ppt_funcs->allow_xgmi_power_down)
-               return 0;
-
-       ret = smu->ppt_funcs->allow_xgmi_power_down(smu, en);
-       if (ret)
-               dev_err(smu->adev->dev, "[AllowXgmiPowerDown] failed!\n");
-
-       return ret;
-}
-
 int smu_write_watermarks_table(struct smu_context *smu)
 {
        if (!smu->pm_enabled || !smu->adev->pm.dpm_enabled)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
index e17169f..4f6df35 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
@@ -834,12 +834,6 @@ struct pptable_funcs {
         */
        int (*set_df_cstate)(struct smu_context *smu, enum pp_df_cstate state);
 
-       /**
-        * @allow_xgmi_power_down: Enable/disable external global memory
-        *                         interconnect power down.
-        */
-       int (*allow_xgmi_power_down)(struct smu_context *smu, bool en);
-
        /**
         * @select_xgmi_plpd_policy: Select xgmi per-link power down policy.
         */
@@ -1491,8 +1485,6 @@ int smu_set_gfx_power_up_by_imu(struct smu_context *smu);
 
 int smu_set_ac_dc(struct smu_context *smu);
 
-int smu_allow_xgmi_power_down(struct smu_context *smu, bool en);
-
 int smu_set_xgmi_plpd_mode(struct smu_context *smu,
                           enum pp_xgmi_plpd_mode mode);