Commit 86b93fd6 authored by Jack Zhang's avatar Jack Zhang Committed by Alex Deucher

drm/amdgpu/sriov Don't send msg when smu suspend

For sriov and pp_onevf_mode, do not send message to set smu
status, because smu doesn't support these messages under VF.

Besides, it should skip smu_suspend when pp_onevf_mode is disabled.
Signed-off-by: default avatarJack Zhang <Jack.Zhang1@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Acked-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent fa1d7297
...@@ -2344,15 +2344,16 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev) ...@@ -2344,15 +2344,16 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev)
} }
adev->ip_blocks[i].status.hw = false; adev->ip_blocks[i].status.hw = false;
/* handle putting the SMC in the appropriate state */ /* handle putting the SMC in the appropriate state */
if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SMC) { if(!amdgpu_sriov_vf(adev)){
r = amdgpu_dpm_set_mp1_state(adev, adev->mp1_state); if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SMC) {
if (r) { r = amdgpu_dpm_set_mp1_state(adev, adev->mp1_state);
DRM_ERROR("SMC failed to set mp1 state %d, %d\n", if (r) {
adev->mp1_state, r); DRM_ERROR("SMC failed to set mp1 state %d, %d\n",
return r; adev->mp1_state, r);
return r;
}
} }
} }
adev->ip_blocks[i].status.hw = false; adev->ip_blocks[i].status.hw = false;
} }
......
...@@ -1461,21 +1461,26 @@ static int smu_suspend(void *handle) ...@@ -1461,21 +1461,26 @@ static int smu_suspend(void *handle)
struct smu_context *smu = &adev->smu; struct smu_context *smu = &adev->smu;
bool baco_feature_is_enabled = false; bool baco_feature_is_enabled = false;
if (amdgpu_sriov_vf(adev)&& !amdgpu_sriov_is_pp_one_vf(adev))
return 0;
if (!smu->pm_enabled) if (!smu->pm_enabled)
return 0; return 0;
if(!smu->is_apu) if(!smu->is_apu)
baco_feature_is_enabled = smu_feature_is_enabled(smu, SMU_FEATURE_BACO_BIT); baco_feature_is_enabled = smu_feature_is_enabled(smu, SMU_FEATURE_BACO_BIT);
ret = smu_system_features_control(smu, false); if(!amdgpu_sriov_vf(adev)) {
if (ret) ret = smu_system_features_control(smu, false);
return ret; if (ret)
if (baco_feature_is_enabled) {
ret = smu_feature_set_enabled(smu, SMU_FEATURE_BACO_BIT, true);
if (ret) {
pr_warn("set BACO feature enabled failed, return %d\n", ret);
return ret; return ret;
if (baco_feature_is_enabled) {
ret = smu_feature_set_enabled(smu, SMU_FEATURE_BACO_BIT, true);
if (ret) {
pr_warn("set BACO feature enabled failed, return %d\n", ret);
return ret;
}
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment