diff options
author | Dave Airlie <airlied@redhat.com> | 2010-10-07 18:57:10 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-10-18 19:49:42 -0400 |
commit | c9220b0f7cbd1d2272426aa81a72ae2f6582bb71 (patch) | |
tree | 223bf3f0edb2bf151687155b1f199ee280376276 /include | |
parent | b7ae5056c94a8191c1fd0b5697707377516c0c5d (diff) |
drm/ttm: add unlocked variant of new manager put node.
We need the unlocked variant for the new codepath introduced to fix the
race condition in master recently.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/drm/ttm/ttm_bo_driver.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/drm/ttm/ttm_bo_driver.h b/include/drm/ttm/ttm_bo_driver.h index e3371dbe6a10..d0ff529fedde 100644 --- a/include/drm/ttm/ttm_bo_driver.h +++ b/include/drm/ttm/ttm_bo_driver.h | |||
@@ -214,6 +214,8 @@ struct ttm_mem_type_manager_func { | |||
214 | struct ttm_mem_reg *mem); | 214 | struct ttm_mem_reg *mem); |
215 | void (*put_node)(struct ttm_mem_type_manager *man, | 215 | void (*put_node)(struct ttm_mem_type_manager *man, |
216 | struct ttm_mem_reg *mem); | 216 | struct ttm_mem_reg *mem); |
217 | void (*put_node_locked)(struct ttm_mem_type_manager *man, | ||
218 | struct ttm_mem_reg *mem); | ||
217 | void (*debug)(struct ttm_mem_type_manager *man, const char *prefix); | 219 | void (*debug)(struct ttm_mem_type_manager *man, const char *prefix); |
218 | }; | 220 | }; |
219 | 221 | ||
@@ -667,6 +669,8 @@ extern int ttm_bo_mem_space(struct ttm_buffer_object *bo, | |||
667 | 669 | ||
668 | extern void ttm_bo_mem_put(struct ttm_buffer_object *bo, | 670 | extern void ttm_bo_mem_put(struct ttm_buffer_object *bo, |
669 | struct ttm_mem_reg *mem); | 671 | struct ttm_mem_reg *mem); |
672 | extern void ttm_bo_mem_put_locked(struct ttm_buffer_object *bo, | ||
673 | struct ttm_mem_reg *mem); | ||
670 | 674 | ||
671 | /** | 675 | /** |
672 | * ttm_bo_wait_for_cpu | 676 | * ttm_bo_wait_for_cpu |