From: Leo Liu <leo.liu@amd.com>
Date: Fri, 13 Jul 2018 15:26:28 +0000 (-0400)
Subject: drm/amdgpu: Make sure IB tests flushed after IP resume
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=96a5d8d4915f3e241ebb48d5decdd110ab9c7dcf;p=linux.git

drm/amdgpu: Make sure IB tests flushed after IP resume

Fixes: 2c773de2 (drm/amdgpu: defer test IBs on the rings at boot (V3))

Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Christian König <christian.koenig@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 6e5284e6c028d..2c5f093e79e36 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2747,6 +2747,9 @@ int amdgpu_device_resume(struct drm_device *dev, bool resume, bool fbcon)
 	if (r)
 		return r;
 
+	/* Make sure IB tests flushed */
+	flush_delayed_work(&adev->late_init_work);
+
 	/* blat the mode back in */
 	if (fbcon) {
 		if (!amdgpu_device_has_dc_support(adev)) {