diff options
| author | Emily Deng <Emily.Deng@amd.com> | 2019-10-15 10:08:22 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-10-15 15:50:23 -0400 |
| commit | bcccee89f48c1e96b2aea067507e89f3581693bb (patch) | |
| tree | 9287d7c56d1884884ef1844d55998749b925db9f /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | b2c18f0a9c8bd0fa5c1239830b787d5f8288f7b5 (diff) | |
| download | linux-bcccee89f48c1e96b2aea067507e89f3581693bb.tar.gz linux-bcccee89f48c1e96b2aea067507e89f3581693bb.tar.bz2 linux-bcccee89f48c1e96b2aea067507e89f3581693bb.zip | |
drm/amdgpu: Fix tdr3 could hang with slow compute issue
When index is 1, need to set compute ring timeout for sriov and passthrough.
Signed-off-by: Emily Deng <Emily.Deng@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index f25275abf408..75a0db394e21 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -2622,8 +2622,11 @@ static int amdgpu_device_get_job_timeout_settings(struct amdgpu_device *adev) * There is only one value specified and * it should apply to all non-compute jobs. */ - if (index == 1) + if (index == 1) { adev->sdma_timeout = adev->video_timeout = adev->gfx_timeout; + if (amdgpu_sriov_vf(adev) || amdgpu_passthrough(adev)) + adev->compute_timeout = adev->gfx_timeout; + } } return ret; |