History

drm/ttm: remove use_ticket parameter from ttm_bo_reserve

Not used any more.

Christian König committed 10 years ago

Commit dfd5e501 parent 5ee7b4125 files · +55 −62Browse files

Showing the changes to include/drm (1 of 25 files). Show all

Unified · Split

include/drm/ttm/ttm_bo_driver.h+5−9
@@ -759,8 +759,7 @@ extern void ttm_bo_add_to_lru(struct ttm_buffer_object *bo); · 758 unmodified lines
759 * @bo: A pointer to a struct ttm_buffer_object.759 * @bo: A pointer to a struct ttm_buffer_object.
760 * @interruptible: Sleep interruptible if waiting.760 * @interruptible: Sleep interruptible if waiting.
761 * @no_wait: Don't sleep while trying to reserve, rather return -EBUSY.761 * @no_wait: Don't sleep while trying to reserve, rather return -EBUSY.
762 * @use_ticket: If @bo is already reserved, Only sleep waiting for762 * @ticket: ticket used to acquire the ww_mutex.
763 * it to become unreserved if @ticket->stamp is older.
764 *763 *
765 * Will not remove reserved buffers from the lru lists.764 * Will not remove reserved buffers from the lru lists.
766 * Otherwise identical to ttm_bo_reserve.765 * Otherwise identical to ttm_bo_reserve.
@@ -776,8 +775,7 @@ extern void ttm_bo_add_to_lru(struct ttm_buffer_object *bo); · 9 unmodified lines
776 * be returned if @use_ticket is set to true.775 * be returned if @use_ticket is set to true.
777 */776 */
778static inline int __ttm_bo_reserve(struct ttm_buffer_object *bo,777static inline int __ttm_bo_reserve(struct ttm_buffer_object *bo,
779 bool interruptible,778 bool interruptible, bool no_wait,
780 bool no_wait, bool use_ticket,
781 struct ww_acquire_ctx *ticket)779 struct ww_acquire_ctx *ticket)
782{780{
783 int ret = 0;781 int ret = 0;
@@ -806,8 +804,7 @@ static inline int __ttm_bo_reserve(struct ttm_buffer_object *bo, · 22 unmodified lines
806 * @bo: A pointer to a struct ttm_buffer_object.804 * @bo: A pointer to a struct ttm_buffer_object.
807 * @interruptible: Sleep interruptible if waiting.805 * @interruptible: Sleep interruptible if waiting.
808 * @no_wait: Don't sleep while trying to reserve, rather return -EBUSY.806 * @no_wait: Don't sleep while trying to reserve, rather return -EBUSY.
809 * @use_ticket: If @bo is already reserved, Only sleep waiting for807 * @ticket: ticket used to acquire the ww_mutex.
810 * it to become unreserved if @ticket->stamp is older.
811 *808 *
812 * Locks a buffer object for validation. (Or prevents other processes from809 * Locks a buffer object for validation. (Or prevents other processes from
813 * locking it for validation) and removes it from lru lists, while taking810 * locking it for validation) and removes it from lru lists, while taking
@@ -846,15 +843,14 @@ static inline int __ttm_bo_reserve(struct ttm_buffer_object *bo, · 32 unmodified lines
846 * be returned if @use_ticket is set to true.843 * be returned if @use_ticket is set to true.
847 */844 */
848static inline int ttm_bo_reserve(struct ttm_buffer_object *bo,845static inline int ttm_bo_reserve(struct ttm_buffer_object *bo,
849 bool interruptible,846 bool interruptible, bool no_wait,
850 bool no_wait, bool use_ticket,
851 struct ww_acquire_ctx *ticket)847 struct ww_acquire_ctx *ticket)
852{848{
853 int ret;849 int ret;
854 850
855 WARN_ON(!atomic_read(&bo->kref.refcount));851 WARN_ON(!atomic_read(&bo->kref.refcount));
856 852
857 ret = __ttm_bo_reserve(bo, interruptible, no_wait, use_ticket, ticket);853 ret = __ttm_bo_reserve(bo, interruptible, no_wait, ticket);
858 if (likely(ret == 0))854 if (likely(ret == 0))
859 ttm_bo_del_sub_from_lru(bo);855 ttm_bo_del_sub_from_lru(bo);
860 856

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t