From: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Date: Fri, 19 Jan 2018 22:23:08 +0000 (-0500)
Subject: drm/amdgpu: Reenable manual GPU reset from sysfs
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=54bc1398cc0c3affa301d65370be2fd8dcf1bf08;p=openwrt%2Fstaging%2Fblogic.git

drm/amdgpu: Reenable manual GPU reset from sysfs

Otherwise it keeps rejecting the reset.

Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@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 9baf182d5418..03f2e56673d1 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2619,7 +2619,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
 	uint64_t reset_flags = 0;
 	int i, r, resched;
 
-	if (!amdgpu_device_ip_check_soft_reset(adev)) {
+	if (!force && !amdgpu_device_ip_check_soft_reset(adev)) {
 		DRM_INFO("No hardware hang detected. Did some blocks stall?\n");
 		return 0;
 	}