aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2017-11-08 15:06:03 -0500
committerAlex Deucher <alexander.deucher@amd.com>2017-12-06 12:47:20 -0500
commitadd526b34a8e183d9df14f1acaaffae31bbf52d0 (patch)
treed75d55173b0a263590d5cd617009f74def9ef139
parent842cde05840e9203d13383d30cc479f44f4ab599 (diff)
drm/ttm: remove ttm_bo_unreserve_ticket
Just another alias for ttm_bo_unreserve. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_gem.c2
-rw-r--r--include/drm/ttm/ttm_bo_driver.h13
2 files changed, 1 insertions, 14 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index efc89aaef66a..e72a7e37eb0a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -354,7 +354,7 @@ validate_fini_no_ticket(struct validate_op *op, struct nouveau_fence *fence,
354 354
355 list_del(&nvbo->entry); 355 list_del(&nvbo->entry);
356 nvbo->reserved_by = NULL; 356 nvbo->reserved_by = NULL;
357 ttm_bo_unreserve_ticket(&nvbo->bo, &op->ticket); 357 ttm_bo_unreserve(&nvbo->bo);
358 drm_gem_object_unreference_unlocked(&nvbo->gem); 358 drm_gem_object_unreference_unlocked(&nvbo->gem);
359 } 359 }
360} 360}
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index 3659cf6150d2..cba1477aa983 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -957,19 +957,6 @@ static inline void ttm_bo_unreserve(struct ttm_buffer_object *bo)
957 reservation_object_unlock(bo->resv); 957 reservation_object_unlock(bo->resv);
958} 958}
959 959
960/**
961 * ttm_bo_unreserve_ticket
962 * @bo: A pointer to a struct ttm_buffer_object.
963 * @ticket: ww_acquire_ctx used for reserving
964 *
965 * Unreserve a previous reservation of @bo made with @ticket.
966 */
967static inline void ttm_bo_unreserve_ticket(struct ttm_buffer_object *bo,
968 struct ww_acquire_ctx *t)
969{
970 ttm_bo_unreserve(bo);
971}
972
973/* 960/*
974 * ttm_bo_util.c 961 * ttm_bo_util.c
975 */ 962 */