diff options
author | Chunming Zhou <David1.Zhou@amd.com> | 2016-08-30 04:36:25 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-08-31 15:21:13 -0400 |
commit | 2c0d7318c8b071bf9688bb5f2bedba95856e0d42 (patch) | |
tree | 493539d948c2d52dcf374fdecb53db22522356c3 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
parent | 5c1354bd30c118326236e13cfdc49db03d2b5855 (diff) |
drm/amdgpu: add gart recovery by gtt list V2
V2:
a. gart recovery should be ahead of ring test.
b. rename to amdgpu_ttm_recover_gart
Signed-off-by: Chunming Zhou <David1.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@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, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index bfdd445a8bb6..c2459abb408d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |||
@@ -2206,6 +2206,11 @@ retry: | |||
2206 | } | 2206 | } |
2207 | if (!r) { | 2207 | if (!r) { |
2208 | amdgpu_irq_gpu_reset_resume_helper(adev); | 2208 | amdgpu_irq_gpu_reset_resume_helper(adev); |
2209 | if (need_full_reset && amdgpu_need_backup(adev)) { | ||
2210 | r = amdgpu_ttm_recover_gart(adev); | ||
2211 | if (r) | ||
2212 | DRM_ERROR("gart recovery failed!!!\n"); | ||
2213 | } | ||
2209 | r = amdgpu_ib_ring_tests(adev); | 2214 | r = amdgpu_ib_ring_tests(adev); |
2210 | if (r) { | 2215 | if (r) { |
2211 | dev_err(adev->dev, "ib ring test failed (%d).\n", r); | 2216 | dev_err(adev->dev, "ib ring test failed (%d).\n", r); |