drm/amdgpu: use mode-2 reset for RAS poison consumption

Tao Zhou · alexdeucher · commit f7aeee734615 · 2023-11-03T11:38:13.000-04:00
Switch from mode-1 reset to mode-2 for poison consumption.

Signed-off-by: Tao Zhou &lt;tao.zhou1@amd.com&gt;
Reviewed-by: Stanley.Yang &lt;Stanley.Yang@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c
@@ -166,8 +166,12 @@ static int amdgpu_umc_do_page_retirement(struct amdgpu_device *adev,
 			}
 		}
 
-		if (reset)
+		if (reset) {
+			/* use mode-2 reset for poison consumption */
+			if (!entry)
+				con->gpu_reset_flags |= AMDGPU_RAS_GPU_RESET_MODE2_RESET;
 			amdgpu_ras_reset_gpu(adev);
+		}
 	}
 
 	kfree(err_data->err_addr);

Original file line number	Diff line number	Diff line change
`@@ -166,8 +166,12 @@ static int amdgpu_umc_do_page_retirement(struct amdgpu_device *adev,`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
`169`		`- if (reset)`
	`169`	`+ if (reset) {`
	`170`	`+ /* use mode-2 reset for poison consumption */`
	`171`	`+ if (!entry)`
	`172`	`+ con->gpu_reset_flags \|= AMDGPU_RAS_GPU_RESET_MODE2_RESET;`
`170`	`173`	`amdgpu_ras_reset_gpu(adev);`
	`174`	`+ }`
`171`	`175`	`}`
`172`	`176`
`173`	`177`	`kfree(err_data->err_addr);`