From: xinhui pan <xinhui.pan@amd.com>
Date: Wed, 8 May 2019 16:13:22 +0000 (+0800)
Subject: drm/amdgpu: gpu reset will run ras post init
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e79a04d531478e4ccbd3c22288b1229677e1e489;p=linux.git

drm/amdgpu: gpu reset will run ras post init

ras need initialize proper state after late init

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>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index b2ba051edd903..d7e3af3e1ea11 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -3498,6 +3498,9 @@ static int amdgpu_do_asic_reset(struct amdgpu_hive_info *hive,
 				if (r)
 					goto out;
 
+				/* must succeed. */
+				amdgpu_ras_post_init(tmp_adev);
+
 				/* Update PSP FW topology after reset */
 				if (hive && tmp_adev->gmc.xgmi.num_physical_nodes > 1)
 					r = amdgpu_xgmi_update_topology(hive, tmp_adev);