Commit 895bd048 authored by Jack Zhang's avatar Jack Zhang Committed by Alex Deucher
Browse files

amd/amdgpu/sriov tdr enablement with pp_onevf_mode 



Under sriov and pp_onevf mode,
1.take resume instead of hw_init for smc recover to avoid
potential memory leak.

2.add return condition inside smc resume function for
sriov_pp_onevf_mode and pm_enabled param.

Signed-off-by: default avatarJack Zhang <Jack.Zhang1@amd.com>
Acked-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c2a801af

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+5 −1
Original line number Diff line number Diff line
@@ -2455,7 +2455,11 @@ static int amdgpu_device_ip_reinit_late_sriov(struct amdgpu_device *adev) 
				block->status.hw)

				continue;



			if (block->version->type == AMD_IP_BLOCK_TYPE_SMC)

				r = block->version->funcs->resume(adev);

			else

				r = block->version->funcs->hw_init(adev);



			DRM_INFO("RE-INIT-late: %s %s\n", block->version->funcs->name, r?"failed":"succeeded");

			if (r)

				return r;

drivers/gpu/drm/amd/powerplay/amdgpu_smu.c

+6 −0
Original line number Diff line number Diff line
@@ -1445,6 +1445,12 @@ static int smu_resume(void *handle) 
	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct smu_context *smu = &adev->smu;



	if (amdgpu_sriov_vf(adev)&& !amdgpu_sriov_is_pp_one_vf(adev))

		return 0;



	if (!smu->pm_enabled)

		return 0;



	pr_info("SMU is resuming...\n");



	ret = smu_start_smc_engine(smu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE