diff options
author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2012-10-12 11:02:19 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-11-20 01:09:55 -0500 |
commit | 5fb4ef0e36b4c6ecc7fb025aaacb3b63b1114e87 (patch) | |
tree | 425e7b5c48bbe54769925ad5c48cf3d9de74e088 /include | |
parent | be013367fd6fbab52ddf6f76c243f4109090c890 (diff) |
drm/ttm: remove sync_obj_arg member
vmwgfx was its only user and always sets it to the same..
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Reviewed-By: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/drm/ttm/ttm_bo_api.h | 2 | ||||
-rw-r--r-- | include/drm/ttm/ttm_execbuf_util.h | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h index a554c2e22d56..5ff938df5fce 100644 --- a/include/drm/ttm/ttm_bo_api.h +++ b/include/drm/ttm/ttm_bo_api.h | |||
@@ -170,7 +170,6 @@ struct ttm_tt; | |||
170 | * @seq_valid: The value of @val_seq is valid. This value is protected by | 170 | * @seq_valid: The value of @val_seq is valid. This value is protected by |
171 | * the bo_device::lru_lock. | 171 | * the bo_device::lru_lock. |
172 | * @reserved: Deadlock-free lock used for synchronization state transitions. | 172 | * @reserved: Deadlock-free lock used for synchronization state transitions. |
173 | * @sync_obj_arg: Opaque argument to synchronization object function. | ||
174 | * @sync_obj: Pointer to a synchronization object. | 173 | * @sync_obj: Pointer to a synchronization object. |
175 | * @priv_flags: Flags describing buffer object internal state. | 174 | * @priv_flags: Flags describing buffer object internal state. |
176 | * @vm_rb: Rb node for the vm rb tree. | 175 | * @vm_rb: Rb node for the vm rb tree. |
@@ -252,7 +251,6 @@ struct ttm_buffer_object { | |||
252 | * checking NULL while reserved but not holding the mentioned lock. | 251 | * checking NULL while reserved but not holding the mentioned lock. |
253 | */ | 252 | */ |
254 | 253 | ||
255 | void *sync_obj_arg; | ||
256 | void *sync_obj; | 254 | void *sync_obj; |
257 | unsigned long priv_flags; | 255 | unsigned long priv_flags; |
258 | 256 | ||
diff --git a/include/drm/ttm/ttm_execbuf_util.h b/include/drm/ttm/ttm_execbuf_util.h index 1926cae373ba..547e19f06e57 100644 --- a/include/drm/ttm/ttm_execbuf_util.h +++ b/include/drm/ttm/ttm_execbuf_util.h | |||
@@ -39,8 +39,6 @@ | |||
39 | * | 39 | * |
40 | * @head: list head for thread-private list. | 40 | * @head: list head for thread-private list. |
41 | * @bo: refcounted buffer object pointer. | 41 | * @bo: refcounted buffer object pointer. |
42 | * @new_sync_obj_arg: New sync_obj_arg for @bo, to be used once | ||
43 | * adding a new sync object. | ||
44 | * @reserved: Indicates whether @bo has been reserved for validation. | 42 | * @reserved: Indicates whether @bo has been reserved for validation. |
45 | * @removed: Indicates whether @bo has been removed from lru lists. | 43 | * @removed: Indicates whether @bo has been removed from lru lists. |
46 | * @put_count: Number of outstanding references on bo::list_kref. | 44 | * @put_count: Number of outstanding references on bo::list_kref. |
@@ -50,7 +48,6 @@ | |||
50 | struct ttm_validate_buffer { | 48 | struct ttm_validate_buffer { |
51 | struct list_head head; | 49 | struct list_head head; |
52 | struct ttm_buffer_object *bo; | 50 | struct ttm_buffer_object *bo; |
53 | void *new_sync_obj_arg; | ||
54 | bool reserved; | 51 | bool reserved; |
55 | bool removed; | 52 | bool removed; |
56 | int put_count; | 53 | int put_count; |