Dear Emily,
Am 06.01.21 um 12:41 schrieb Emily.Deng:
Could you please remove the dot your name in your git configuration?
git config --global user.name "Emily Deng"
For the summary, maybe amend it to:
Decrease compute timeout to 10 s for sriov multiple VF
For multiple VF, after engine hang,as host driver will first
Nit: Please add a space after the comma.
encounter FLR, so has no meanning to set compute to 60s.
meaning
How can this be tested?
Signed-off-by: Emily.Deng <Emily.Deng@xxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index b69c34074d8d..ed36bf97df29 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3117,8 +3117,10 @@ static int amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev)
*/
adev->gfx_timeout = msecs_to_jiffies(10000);
adev->sdma_timeout = adev->video_timeout = adev->gfx_timeout;
- if (amdgpu_sriov_vf(adev) || amdgpu_passthrough(adev))
+ if ((amdgpu_sriov_vf(adev) && amdgpu_sriov_is_pp_one_vf(adev)) || amdgpu_passthrough(adev))
adev->compute_timeout = msecs_to_jiffies(60000);
+ else if (amdgpu_sriov_vf(adev))
+ adev->compute_timeout = msecs_to_jiffies(10000);
Maybe split up the first if condition to group the condition and not he
timeout values. At least for me that would be less confusing:
if (amdgpu_sriov_vf(adev))
adev->compute_timeout = amdgpu_sriov_is_pp_one_vf(adev) ?
msecs_to_jiffies(60000) : msecs_to_jiffies(10000)
else if (amdgpu_passthrough(adev))
adev->compute_timeout = msecs_to_jiffies(60000);
else
adev->compute_timeout = MAX_SCHEDULE_TIMEOUT;
Kind regards,
Paul
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
