]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: remove amdgpu_cs_handle_lockup
authorHuang Rui <ray.huang@amd.com>
Mon, 31 Oct 2016 09:00:21 +0000 (17:00 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 11 Nov 2016 15:20:55 +0000 (10:20 -0500)
In fence waiting, it never return -EDEADLK yet, so drop this function
here.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c

index 15c56c825b868d4e0d3937d8f57fe7982d4f36b1..5a277495d6a31606592cabc4caa996d5b39775eb 100644 (file)
@@ -841,16 +841,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)
 {
@@ -1088,7 +1078,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;
 }