diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_display.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index 083e2b429872..075c0d7db205 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | |||
@@ -35,29 +35,29 @@ | |||
35 | #include <drm/drm_crtc_helper.h> | 35 | #include <drm/drm_crtc_helper.h> |
36 | #include <drm/drm_edid.h> | 36 | #include <drm/drm_edid.h> |
37 | 37 | ||
38 | static void amdgpu_flip_callback(struct fence *f, struct fence_cb *cb) | 38 | static void amdgpu_flip_callback(struct dma_fence *f, struct dma_fence_cb *cb) |
39 | { | 39 | { |
40 | struct amdgpu_flip_work *work = | 40 | struct amdgpu_flip_work *work = |
41 | container_of(cb, struct amdgpu_flip_work, cb); | 41 | container_of(cb, struct amdgpu_flip_work, cb); |
42 | 42 | ||
43 | fence_put(f); | 43 | dma_fence_put(f); |
44 | schedule_work(&work->flip_work.work); | 44 | schedule_work(&work->flip_work.work); |
45 | } | 45 | } |
46 | 46 | ||
47 | static bool amdgpu_flip_handle_fence(struct amdgpu_flip_work *work, | 47 | static bool amdgpu_flip_handle_fence(struct amdgpu_flip_work *work, |
48 | struct fence **f) | 48 | struct dma_fence **f) |
49 | { | 49 | { |
50 | struct fence *fence= *f; | 50 | struct dma_fence *fence= *f; |
51 | 51 | ||
52 | if (fence == NULL) | 52 | if (fence == NULL) |
53 | return false; | 53 | return false; |
54 | 54 | ||
55 | *f = NULL; | 55 | *f = NULL; |
56 | 56 | ||
57 | if (!fence_add_callback(fence, &work->cb, amdgpu_flip_callback)) | 57 | if (!dma_fence_add_callback(fence, &work->cb, amdgpu_flip_callback)) |
58 | return true; | 58 | return true; |
59 | 59 | ||
60 | fence_put(fence); | 60 | dma_fence_put(fence); |
61 | return false; | 61 | return false; |
62 | } | 62 | } |
63 | 63 | ||
@@ -244,9 +244,9 @@ unreserve: | |||
244 | 244 | ||
245 | cleanup: | 245 | cleanup: |
246 | amdgpu_bo_unref(&work->old_abo); | 246 | amdgpu_bo_unref(&work->old_abo); |
247 | fence_put(work->excl); | 247 | dma_fence_put(work->excl); |
248 | for (i = 0; i < work->shared_count; ++i) | 248 | for (i = 0; i < work->shared_count; ++i) |
249 | fence_put(work->shared[i]); | 249 | dma_fence_put(work->shared[i]); |
250 | kfree(work->shared); | 250 | kfree(work->shared); |
251 | kfree(work); | 251 | kfree(work); |
252 | 252 | ||