diff options
| author | Andrey Grodzovsky <andrey.grodzovsky@amd.com> | 2018-01-19 17:23:08 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2018-01-23 01:42:48 -0500 |
| commit | 54bc1398cc0c3affa301d65370be2fd8dcf1bf08 (patch) | |
| tree | 5fb21beb02c8e6f71e32a1c6714db5b211ac6d31 /drivers/gpu/drm/amd/amdgpu | |
| parent | 400b6afbaa949914460e5fd1d769c5e26ef1f6b8 (diff) | |
| download | linux-54bc1398cc0c3affa301d65370be2fd8dcf1bf08.tar.gz linux-54bc1398cc0c3affa301d65370be2fd8dcf1bf08.tar.bz2 linux-54bc1398cc0c3affa301d65370be2fd8dcf1bf08.zip | |
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')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 |
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, 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; } |