drm/amdgpu/pm: Check AMDGPU_RUNPM_BAMACO when setting baco state

Check AMDGPU_RUNPM_BAMACO intead of amdgpu_runtime_pm
when setting baco state.

Signed-off-by: Ma Jun <Jun.Ma2@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/pm/swsmu/smu11/smu_v11_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index 8407ca4fdc172c944ddae1ea43f79dabd2af6ccd..9d5ab2ea643a4516e2e2f001be8755047bceee33 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
@@ -1607,7 +1607,7 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state)
                case IP_VERSION(11, 0, 11):
                case IP_VERSION(11, 0, 12):
                case IP_VERSION(11, 0, 13):
-                       if (amdgpu_runtime_pm == 2)
+                       if (adev->pm.rpm_mode == AMDGPU_RUNPM_BAMACO)
                                ret = smu_cmn_send_smc_msg_with_param(smu,
                                                                      SMU_MSG_EnterBaco,
                                                                      D3HOT_BAMACO_SEQUENCE,

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 7277cc72d7f5d877b7c44b26479460a1cef00ab4..a8d34adc7d3f131cdb85846f801db58f243ac5b0 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
@@ -2247,7 +2247,7 @@ static int smu_v13_0_baco_set_state(struct smu_context *smu,
        if (state == SMU_BACO_STATE_ENTER) {
                ret = smu_cmn_send_smc_msg_with_param(smu,
                                                      SMU_MSG_EnterBaco,
-                                                     (smu_baco->maco_support && amdgpu_runtime_pm != 1) ?
+                                                     (adev->pm.rpm_mode == AMDGPU_RUNPM_BAMACO) ?
                                                      BACO_SEQ_BAMACO : BACO_SEQ_BACO,
                                                      NULL);
        } else {
@@ -2292,13 +2292,12 @@ int smu_v13_0_get_bamaco_support(struct smu_context *smu)
 
 int smu_v13_0_baco_enter(struct smu_context *smu)
 {
-       struct smu_baco_context *smu_baco = &smu->smu_baco;
        struct amdgpu_device *adev = smu->adev;
        int ret;
 
        if (adev->in_runpm && smu_cmn_is_audio_func_enabled(adev)) {
                return smu_v13_0_baco_set_armd3_sequence(smu,
-                               (smu_baco->maco_support && amdgpu_runtime_pm != 1) ?
+                               (adev->pm.rpm_mode == AMDGPU_RUNPM_BAMACO) ?
                                        BACO_SEQ_BAMACO : BACO_SEQ_BACO);
        } else {
                ret = smu_v13_0_baco_set_state(smu, SMU_BACO_STATE_ENTER);

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
index 707b37f535e225979389103f4718aca609f93afc..2c3517397b141c5165b54bdaee53638c9eb84226 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c
@@ -1633,7 +1633,7 @@ int smu_v14_0_baco_set_state(struct smu_context *smu,
        if (state == SMU_BACO_STATE_ENTER) {
                ret = smu_cmn_send_smc_msg_with_param(smu,
                                                      SMU_MSG_EnterBaco,
-                                                     smu_baco->maco_support ?
+                                                     (adev->pm.rpm_mode == AMDGPU_RUNPM_BAMACO) ?
                                                      BACO_SEQ_BAMACO : BACO_SEQ_BACO,
                                                      NULL);
        } else {