aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorxinhui pan <xinhui.pan@amd.com>2019-03-01 00:29:13 -0500
committerAlex Deucher <alexander.deucher@amd.com>2019-03-19 16:36:51 -0400
commit138352e5752aa3e694951d70c8fe8730219f4edf (patch)
treef075a87744b74f87ebd8f96d34845e81430c4a94 /drivers/gpu/drm
parent5cb771143ed9552c672b6e1d6a3005a435b54e44 (diff)
drm/amdgpu: skip gpu reset when ras error occured
gpu reset is not stable on vega20 A1. Signed-off-by: xinhui pan <xinhui.pan@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')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
index 599dcd01aec7..02cb9a13ddc5 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
@@ -182,10 +182,13 @@ int amdgpu_ras_reserve_bad_pages(struct amdgpu_device *adev);
182static inline int amdgpu_ras_reset_gpu(struct amdgpu_device *adev, 182static inline int amdgpu_ras_reset_gpu(struct amdgpu_device *adev,
183 bool is_baco) 183 bool is_baco)
184{ 184{
185 /* remove me when gpu reset works on vega20 A1. */
186#if 0
185 struct amdgpu_ras *ras = amdgpu_ras_get_context(adev); 187 struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);
186 188
187 if (atomic_cmpxchg(&ras->in_recovery, 0, 1) == 0) 189 if (atomic_cmpxchg(&ras->in_recovery, 0, 1) == 0)
188 schedule_work(&ras->recovery_work); 190 schedule_work(&ras->recovery_work);
191#endif
189 return 0; 192 return 0;
190} 193}
191 194