aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
diff options
context:
space:
mode:
authorAndrey Grodzovsky <andrey.grodzovsky@amd.com>2018-01-19 17:23:08 -0500
committerAlex Deucher <alexander.deucher@amd.com>2018-01-23 01:42:48 -0500
commit54bc1398cc0c3affa301d65370be2fd8dcf1bf08 (patch)
tree5fb21beb02c8e6f71e32a1c6714db5b211ac6d31 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
parent400b6afbaa949914460e5fd1d769c5e26ef1f6b8 (diff)
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_device.c2
1 files changed, 1 insertions, 1 deletions
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,
2619 uint64_t reset_flags = 0; 2619 uint64_t reset_flags = 0;
2620 int i, r, resched; 2620 int i, r, resched;
2621 2621
2622 if (!amdgpu_device_ip_check_soft_reset(adev)) { 2622 if (!force && !amdgpu_device_ip_check_soft_reset(adev)) {
2623 DRM_INFO("No hardware hang detected. Did some blocks stall?\n"); 2623 DRM_INFO("No hardware hang detected. Did some blocks stall?\n");
2624 return 0; 2624 return 0;
2625 } 2625 }