drm/amdgpu: stop calling amdgpu_gpu_reset from the flip code

We don't return -EDEADLK any more.

Signed-off-by: Christian König <[email protected]>
Acked-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 531627b0a900d077e48c5250b0af69f334ab91f3..1d6ef1a95e747026f9eb08bcd0a8d312dfb388b5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -38,20 +38,12 @@
 static void amdgpu_flip_wait_fence(struct amdgpu_device *adev,
                                   struct fence **f)
 {
-       struct amdgpu_fence *fence;
        long r;
 
        if (*f == NULL)
                return;
 
-       fence = to_amdgpu_fence(*f);
-       if (fence) {
-               r = fence_wait(&fence->base, false);
-               if (r == -EDEADLK)
-                       r = amdgpu_gpu_reset(adev);
-       } else
-               r = fence_wait(*f, false);
-
+       r = fence_wait(*f, false);
        if (r)
                DRM_ERROR("failed to wait on page flip fence (%ld)!\n", r);