diff options
Diffstat (limited to 'include/drm/ttm/ttm_bo_api.h')
-rw-r--r-- | include/drm/ttm/ttm_bo_api.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index b0fc9c12554..edacd483c59 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h | |||
@@ -154,7 +154,6 @@ struct ttm_tt; | |||
154 | * keeps one refcount. When this refcount reaches zero, | 154 | * keeps one refcount. When this refcount reaches zero, |
155 | * the object is destroyed. | 155 | * the object is destroyed. |
156 | * @event_queue: Queue for processes waiting on buffer object status change. | 156 | * @event_queue: Queue for processes waiting on buffer object status change. |
157 | * @lock: spinlock protecting mostly synchronization members. | ||
158 | * @mem: structure describing current placement. | 157 | * @mem: structure describing current placement. |
159 | * @persistant_swap_storage: Usually the swap storage is deleted for buffers | 158 | * @persistant_swap_storage: Usually the swap storage is deleted for buffers |
160 | * pinned in physical memory. If this behaviour is not desired, this member | 159 | * pinned in physical memory. If this behaviour is not desired, this member |
@@ -213,7 +212,6 @@ struct ttm_buffer_object { | |||
213 | struct kref kref; | 212 | struct kref kref; |
214 | struct kref list_kref; | 213 | struct kref list_kref; |
215 | wait_queue_head_t event_queue; | 214 | wait_queue_head_t event_queue; |
216 | spinlock_t lock; | ||
217 | 215 | ||
218 | /** | 216 | /** |
219 | * Members protected by the bo::reserved lock. | 217 | * Members protected by the bo::reserved lock. |
@@ -248,10 +246,10 @@ struct ttm_buffer_object { | |||
248 | atomic_t reserved; | 246 | atomic_t reserved; |
249 | 247 | ||
250 | /** | 248 | /** |
251 | * Members protected by the bo::lock | 249 | * Members protected by struct buffer_object_device::fence_lock |
252 | * In addition, setting sync_obj to anything else | 250 | * In addition, setting sync_obj to anything else |
253 | * than NULL requires bo::reserved to be held. This allows for | 251 | * than NULL requires bo::reserved to be held. This allows for |
254 | * checking NULL while reserved but not holding bo::lock. | 252 | * checking NULL while reserved but not holding the mentioned lock. |
255 | */ | 253 | */ |
256 | 254 | ||
257 | void *sync_obj_arg; | 255 | void *sync_obj_arg; |