aboutsummaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorMaarten Lankhorst <maarten.lankhorst@canonical.com>2014-01-21 07:07:31 -0500
committerMaarten Lankhorst <maarten.lankhorst@canonical.com>2014-09-01 04:16:43 -0400
commitdd7cfd641228abb2669d8d047d5ec377b1835900 (patch)
tree3011650dbd99b204025f65afceb92c40f09da5f9 /include/drm
parent7040138ff85501931138970663a988f48c0666f0 (diff)
drm/ttm: kill fence_lock
No users are left, kill it off! :D Conversion to the reservation api is next on the list, after that the functionality can be restored with rcu. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/ttm/ttm_bo_api.h5
-rw-r--r--include/drm/ttm/ttm_bo_driver.h3
2 files changed, 1 insertions, 7 deletions
diff --git a/include/drm/ttm/ttm_bo_api.h b/include/drm/ttm/ttm_bo_api.h
index e3d39c80a091..5805f4a49478 100644
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
@@ -237,10 +237,7 @@ struct ttm_buffer_object {
237 struct list_head io_reserve_lru; 237 struct list_head io_reserve_lru;
238 238
239 /** 239 /**
240 * Members protected by struct buffer_object_device::fence_lock 240 * Members protected by a bo reservation.
241 * In addition, setting sync_obj to anything else
242 * than NULL requires bo::reserved to be held. This allows for
243 * checking NULL while reserved but not holding the mentioned lock.
244 */ 241 */
245 242
246 void *sync_obj; 243 void *sync_obj;
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h
index 5c8bb5699a6f..e1ee141e26cc 100644
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
@@ -521,8 +521,6 @@ struct ttm_bo_global {
521 * 521 *
522 * @driver: Pointer to a struct ttm_bo_driver struct setup by the driver. 522 * @driver: Pointer to a struct ttm_bo_driver struct setup by the driver.
523 * @man: An array of mem_type_managers. 523 * @man: An array of mem_type_managers.
524 * @fence_lock: Protects the synchronizing members on *all* bos belonging
525 * to this device.
526 * @vma_manager: Address space manager 524 * @vma_manager: Address space manager
527 * lru_lock: Spinlock that protects the buffer+device lru lists and 525 * lru_lock: Spinlock that protects the buffer+device lru lists and
528 * ddestroy lists. 526 * ddestroy lists.
@@ -542,7 +540,6 @@ struct ttm_bo_device {
542 struct ttm_bo_global *glob; 540 struct ttm_bo_global *glob;
543 struct ttm_bo_driver *driver; 541 struct ttm_bo_driver *driver;
544 struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES]; 542 struct ttm_mem_type_manager man[TTM_NUM_MEM_TYPES];
545 spinlock_t fence_lock;
546 543
547 /* 544 /*
548 * Protected by internal locks. 545 * Protected by internal locks.