From: Christian König <christian.koenig@amd.com>
Date: Thu, 11 Feb 2016 13:51:47 +0000 (+0100)
Subject: drm/amdgpu: stop calling amdgpu_gpu_reset from the flip code
X-Git-Tag: next-20160301~70^2~4^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6800e2ea2e74635e5386fc4bb43b0b69edd85a19;p=karo-tx-linux.git

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>
---

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);