diff options
author | Alex Xie <AlexBin.Xie@amd.com> | 2017-04-25 17:09:24 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-04-28 17:33:10 -0400 |
commit | 12d39245f6bea9dfddc29d75225a1d5ffc290186 (patch) | |
tree | 0980b0dc86792af11206a582bef8bab06121338f /drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | |
parent | cca7ecb32b5920f05bb940cbe01dde19c0125620 (diff) |
drm/amdgpu: Fix use of interruptible waiting
There is no good mechanism to handle the corresponding error.
When signal interrupt happens, unpin is not called.
As a result, inside AMDGPU, the statistic of pin size will be wrong.
Signed-off-by: Alex Xie <AlexBin.Xie@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_display.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index 96926a221bd5..d46773b8f7e8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | |||
@@ -169,7 +169,7 @@ static void amdgpu_flip_cleanup_unpin(struct amdgpu_flip_work *work, | |||
169 | void amdgpu_crtc_cleanup_flip_ctx(struct amdgpu_flip_work *work, | 169 | void amdgpu_crtc_cleanup_flip_ctx(struct amdgpu_flip_work *work, |
170 | struct amdgpu_bo *new_abo) | 170 | struct amdgpu_bo *new_abo) |
171 | { | 171 | { |
172 | if (unlikely(amdgpu_bo_reserve(new_abo, false) != 0)) { | 172 | if (unlikely(amdgpu_bo_reserve(new_abo, true) != 0)) { |
173 | DRM_ERROR("failed to reserve new abo in error path\n"); | 173 | DRM_ERROR("failed to reserve new abo in error path\n"); |
174 | amdgpu_flip_work_cleanup(work); | 174 | amdgpu_flip_work_cleanup(work); |
175 | return; | 175 | return; |