From 665052c93a0c303c26f2faa0980297ff7e2f59ba Mon Sep 17 00:00:00 2001 From: Candice Li Date: Tue, 16 Jul 2019 10:08:53 +0800 Subject: [PATCH 2870/2940] Revert "Revert "drm/amdgpu: Disable ras features on all IPs before gpu reset"" This reverts commit d079355d5df97c6f1206b807381cd52699c671c4. Change-Id: Iae9c9ef8f641dabffc67e94664543e084db5ad4a Signed-off-by: Candice Li --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 40989c0c81d4..6edc9d623148 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -3730,6 +3730,10 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, /* block all schedulers and reset given job's ring */ list_for_each_entry(tmp_adev, device_list_handle, gmc.xgmi.head) { + /* disable ras on ALL IPs */ + if (amdgpu_device_ip_need_full_reset(tmp_adev)) + amdgpu_ras_suspend(tmp_adev); + for (i = 0; i < AMDGPU_MAX_RINGS; ++i) { struct amdgpu_ring *ring = tmp_adev->rings[i]; -- 2.17.1