diff options
| author | Dave Airlie | 2010-10-08 00:57:10 +0200 |
|---|---|---|
| committer | Dave Airlie | 2010-10-19 01:49:42 +0200 |
| commit | c9220b0f7cbd1d2272426aa81a72ae2f6582bb71 (patch) | |
| tree | 223bf3f0edb2bf151687155b1f199ee280376276 /drivers/gpu/drm/ttm/ttm_bo_manager.c | |
| parent | Merge branch 'drm-fixes' of /home/airlied/kernel/linux-2.6 into drm-core-next (diff) | |
| download | kernel-qcow2-linux-c9220b0f7cbd1d2272426aa81a72ae2f6582bb71.tar.gz kernel-qcow2-linux-c9220b0f7cbd1d2272426aa81a72ae2f6582bb71.tar.xz kernel-qcow2-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 'drivers/gpu/drm/ttm/ttm_bo_manager.c')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_bo_manager.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c index 7410c190c891..35c97b20bdae 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_manager.c +++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c @@ -90,6 +90,15 @@ static void ttm_bo_man_put_node(struct ttm_mem_type_manager *man, } } +static void ttm_bo_man_put_node_locked(struct ttm_mem_type_manager *man, + struct ttm_mem_reg *mem) +{ + if (mem->mm_node) { + drm_mm_put_block(mem->mm_node); + mem->mm_node = NULL; + } +} + static int ttm_bo_man_init(struct ttm_mem_type_manager *man, unsigned long p_size) { @@ -143,6 +152,7 @@ const struct ttm_mem_type_manager_func ttm_bo_manager_func = { ttm_bo_man_takedown, ttm_bo_man_get_node, ttm_bo_man_put_node, + ttm_bo_man_put_node_locked, ttm_bo_man_debug }; EXPORT_SYMBOL(ttm_bo_manager_func); |