diff options
| author | Christian König <christian.koenig@amd.com> | 2016-02-11 14:51:47 +0100 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2016-02-16 17:23:31 -0500 |
| commit | 6800e2ea2e74635e5386fc4bb43b0b69edd85a19 (patch) | |
| tree | 5e9875802405bbc0990d72aa74548ec5275814f3 /drivers/gpu | |
| parent | 9b3896686fab2be860500ab44770071f15873aa1 (diff) | |
| download | blackbird-op-linux-6800e2ea2e74635e5386fc4bb43b0b69edd85a19.tar.gz blackbird-op-linux-6800e2ea2e74635e5386fc4bb43b0b69edd85a19.zip | |
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 10 |
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); |
