Am 31.10.2016 um 10:24 schrieb Huang Rui:
> In fence waiting, it never return -EDEADLK yet, so drop this function
> here.
>
> Signed-off-by: Huang Rui <ray.huang at amd.com>
Reviewed-by: Christian König <christian.koenig at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 11 -----------
> 1 file changed, 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> index d73dd1b..2c559e6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
> @@ -839,16 +839,6 @@ static int amdgpu_cs_ib_vm_chunk(struct amdgpu_device *adev,
> return amdgpu_cs_sync_rings(p);
> }
>
> -static int amdgpu_cs_handle_lockup(struct amdgpu_device *adev, int r)
> -{
> - if (r == -EDEADLK) {
> - r = amdgpu_gpu_reset(adev);
> - if (!r)
> - r = -EAGAIN;
> - }
> - return r;
> -}
> -
> static int amdgpu_cs_ib_fill(struct amdgpu_device *adev,
> struct amdgpu_cs_parser *parser)
> {
> @@ -1086,7 +1076,6 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
>
> out:
> amdgpu_cs_parser_fini(&parser, r, reserved_buffers);
> - r = amdgpu_cs_handle_lockup(adev, r);
> return r;
> }
>
