Commit 6800e2ea authored by Christian König's avatar Christian König Committed by Alex Deucher

drm/amdgpu: stop calling amdgpu_gpu_reset from the flip code

We don't return -EDEADLK any more.
Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9b389668
...@@ -38,20 +38,12 @@ ...@@ -38,20 +38,12 @@
static void amdgpu_flip_wait_fence(struct amdgpu_device *adev, static void amdgpu_flip_wait_fence(struct amdgpu_device *adev,
struct fence **f) struct fence **f)
{ {
struct amdgpu_fence *fence;
long r; long r;
if (*f == NULL) if (*f == NULL)
return; return;
fence = to_amdgpu_fence(*f); r = fence_wait(*f, false);
if (fence) {
r = fence_wait(&fence->base, false);
if (r == -EDEADLK)
r = amdgpu_gpu_reset(adev);
} else
r = fence_wait(*f, false);
if (r) if (r)
DRM_ERROR("failed to wait on page flip fence (%ld)!\n", r); DRM_ERROR("failed to wait on page flip fence (%ld)!\n", r);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment