drm/amdgpu: stop calling amdgpu_gpu_reset from the flip code

We don't return -EDEADLK any more.

Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index 531627b0a900..1d6ef1a95e74 100644
--- 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);