Acked-by: Andrey Grodzovsky <andrey.grodzovsky@xxxxxxx> Andrey On 01/29/2019 10:16 PM, wentalou wrote: > 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. > > Change-Id: I840dfc145e4e1be9ece6eac8d9f3501da9b28ebf > Signed-off-by: wentalou <Wentao.Lou@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c > index b11a1c17..73851eb 100644 > --- a/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c > +++ b/drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c > @@ -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); > } > _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
