Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c11ee6a authored by wentalou's avatar wentalou Committed by Alex Deucher
Browse files

drm/amdgpu: tighten gpu_recover in mailbox_flr to avoid duplicate recover in sriov 



sriov's gpu_recover inside xgpu_ai_mailbox_flr_work would cause duplicate recover in TDR.
TDR's gpu_recover would be triggered by amdgpu_job_timedout,
that could avoid vk-cts failure by unexpected recover.

Signed-off-by: default avatarWentao Lou <Wentao.Lou@amd.com>
Acked-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e2fb6e0a

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

+2 −1
Original line number Diff line number Diff line
@@ -266,7 +266,8 @@ static void xgpu_ai_mailbox_flr_work(struct work_struct *work) 
	}



	/* Trigger recovery for world switch failure if no TDR */

	if (amdgpu_device_should_recover_gpu(adev))

	if (amdgpu_device_should_recover_gpu(adev)

		&& amdgpu_lockup_timeout == MAX_SCHEDULE_TIMEOUT)

		amdgpu_device_gpu_recover(adev, NULL);

}