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

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
Loading
Loading
Loading
Loading
+8 −7
Original line number Diff line number Diff line
@@ -2344,6 +2344,7 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev)
		}
		adev->ip_blocks[i].status.hw = false;
		/* handle putting the SMC in the appropriate state */
		if(!amdgpu_sriov_vf(adev)){
			if (adev->ip_blocks[i].version->type == AMD_IP_BLOCK_TYPE_SMC) {
				r = amdgpu_dpm_set_mp1_state(adev, adev->mp1_state);
				if (r) {
@@ -2352,7 +2353,7 @@ static int amdgpu_device_ip_suspend_phase2(struct amdgpu_device *adev)
					return r;
				}
			}

		}
		adev->ip_blocks[i].status.hw = false;
	}

+13 −8
Original line number Diff line number Diff line
@@ -1461,12 +1461,16 @@ static int smu_suspend(void *handle)
	struct smu_context *smu = &adev->smu;
	bool baco_feature_is_enabled = false;

	if (amdgpu_sriov_vf(adev)&& !amdgpu_sriov_is_pp_one_vf(adev))
		return 0;

	if (!smu->pm_enabled)
		return 0;

	if(!smu->is_apu)
		baco_feature_is_enabled = smu_feature_is_enabled(smu, SMU_FEATURE_BACO_BIT);

	if(!amdgpu_sriov_vf(adev)) {
		ret = smu_system_features_control(smu, false);
		if (ret)
			return ret;
@@ -1478,6 +1482,7 @@ static int smu_suspend(void *handle)
				return ret;
			}
		}
	}

	smu->watermarks_bitmap &= ~(WATERMARKS_LOADED);