aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2015-12-03 13:55:51 -0500
committerAlex Deucher <alexander.deucher@amd.com>2015-12-04 12:32:47 -0500
commite9d951a832d9a5db33f9d981a810a37f851f8b39 (patch)
tree48ad86078d5decb9907e8c1a7f203da5834ddadb /drivers/gpu
parent6d99905a8c887f6c878f14af1475c3eefdcb0b3e (diff)
drm/amdgpu: take a BO reference in the display code
No need for the GEM reference here. Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/amd/amdgpu/amdgpu_display.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index e173a5a02f0d..ddd7233bbac7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -109,7 +109,7 @@ static void amdgpu_unpin_work_func(struct work_struct *__work)
109 } else 109 } else
110 DRM_ERROR("failed to reserve buffer after flip\n"); 110 DRM_ERROR("failed to reserve buffer after flip\n");
111 111
112 drm_gem_object_unreference_unlocked(&work->old_rbo->gem_base); 112 amdgpu_bo_unref(&work->old_rbo);
113 kfree(work->shared); 113 kfree(work->shared);
114 kfree(work); 114 kfree(work);
115} 115}
@@ -148,8 +148,8 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc,
148 obj = old_amdgpu_fb->obj; 148 obj = old_amdgpu_fb->obj;
149 149
150 /* take a reference to the old object */ 150 /* take a reference to the old object */
151 drm_gem_object_reference(obj);
152 work->old_rbo = gem_to_amdgpu_bo(obj); 151 work->old_rbo = gem_to_amdgpu_bo(obj);
152 amdgpu_bo_ref(work->old_rbo);
153 153
154 new_amdgpu_fb = to_amdgpu_framebuffer(fb); 154 new_amdgpu_fb = to_amdgpu_framebuffer(fb);
155 obj = new_amdgpu_fb->obj; 155 obj = new_amdgpu_fb->obj;
@@ -222,7 +222,7 @@ pflip_cleanup:
222 amdgpu_bo_unreserve(new_rbo); 222 amdgpu_bo_unreserve(new_rbo);
223 223
224cleanup: 224cleanup:
225 drm_gem_object_unreference_unlocked(&work->old_rbo->gem_base); 225 amdgpu_bo_unref(&work->old_rbo);
226 fence_put(work->excl); 226 fence_put(work->excl);
227 for (i = 0; i < work->shared_count; ++i) 227 for (i = 0; i < work->shared_count; ++i)
228 fence_put(work->shared[i]); 228 fence_put(work->shared[i]);