diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-10-08 00:57:10 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-10-19 01:49:42 +0200 |
| commit | c9220b0f7cbd1d2272426aa81a72ae2f6582bb71 (patch) | |
| tree | 223bf3f0edb2bf151687155b1f199ee280376276 /include/drm | |
| parent | Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next (diff) | |
| download | linux-c9220b0f7cbd1d2272426aa81a72ae2f6582bb71.tar.xz linux-c9220b0f7cbd1d2272426aa81a72ae2f6582bb71.zip | |
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/drm')
| -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 { struct ttm_mem_reg *mem); void (*put_node)(struct ttm_mem_type_manager *man, struct ttm_mem_reg *mem); + void (*put_node_locked)(struct ttm_mem_type_manager *man, + struct ttm_mem_reg *mem); void (*debug)(struct ttm_mem_type_manager *man, const char *prefix); }; @@ -667,6 +669,8 @@ extern int ttm_bo_mem_space(struct ttm_buffer_object *bo, extern void ttm_bo_mem_put(struct ttm_buffer_object *bo, struct ttm_mem_reg *mem); +extern void ttm_bo_mem_put_locked(struct ttm_buffer_object *bo, + struct ttm_mem_reg *mem); /** * ttm_bo_wait_for_cpu |