> -----Original Message----- > From: Andrey Grodzovsky [mailto:andrey.grodzovsky at amd.com] > Sent: Friday, January 19, 2018 5:36 PM > To: amd-gfx at lists.freedesktop.org > Cc: Deucher, Alexander <Alexander.Deucher at amd.com>; Grodzovsky, > Andrey <Andrey.Grodzovsky at amd.com> > Subject: [PATCH] drm/amdgpu: Reenable manual GPU reset from sysfs > > Otherwise it keeps rejecting the reset. > > Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky at amd.com> Reviewed-by: Alex Deucher <alexander.deucher at amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index d09c4ee..5025404 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -2620,7 +2620,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; > } > -- > 2.7.4
