From: shaoyunl <shaoyun.liu@amd.com>
Date: Mon, 15 Mar 2021 15:36:14 +0000 (-0400)
Subject: drm/amdgpu: Keep pending_reset valid during smu reset the ASIC
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=050743da315231c329272cb1004c1eabc1e2e715;p=linux.git

drm/amdgpu: Keep pending_reset valid during smu reset the ASIC

SMU internal might need to check this pending_reset setting to decide the reset method

Signed-off-by: shaoyunl <shaoyun.liu@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index 668c209023580..e123828fd0274 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -1359,8 +1359,8 @@ static void amdgpu_drv_delayed_reset_work_handler(struct work_struct *work)
 	}
 	for (i = 0; i < mgpu_info.num_dgpu; i++) {
 		adev = mgpu_info.gpu_ins[i].adev;
-		adev->gmc.xgmi.pending_reset = false;
 		flush_work(&adev->xgmi_reset_work);
+		adev->gmc.xgmi.pending_reset = false;
 	}
 
 	/* reset function will rebuild the xgmi hive info , clear it now */