lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/ttm: Avoid using the ttm_mem_type_manager::put_locked function

Browse Source 
Release the lru spinlock early.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Thomas Hellstrom
2010-10-19 09:01:00 +02:00
committed by Dave Airlie
parent 21c74a8ea8
commit 40d857bba2
3 changed files with 6 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/gpu/drm/ttm/ttm_bo.c
View File

@@ -434,36 +434,25 @@ out_err:
} }
/** /**
* Call bo::reserved and with the lru lock held. * Call bo::reserved.
* Will release GPU memory type usage on destruction. * Will release GPU memory type usage on destruction.
* This is the place to put in driver specific hooks. * This is the place to put in driver specific hooks to release
* Will release the bo::reserved lock and the * driver private resources.
* lru lock on exit. * Will release the bo::reserved lock.
*/ */
static void ttm_bo_cleanup_memtype_use(struct ttm_buffer_object *bo) static void ttm_bo_cleanup_memtype_use(struct ttm_buffer_object *bo)
{ {
struct ttm_bo_global *glob = bo->glob;
if (bo->ttm) { if (bo->ttm) {
/**
* Release the lru_lock, since we don't want to have
* an atomic requirement on ttm_tt[unbind|destroy].
*/
spin_unlock(&glob->lru_lock);
ttm_tt_unbind(bo->ttm); ttm_tt_unbind(bo->ttm);
ttm_tt_destroy(bo->ttm); ttm_tt_destroy(bo->ttm);
bo->ttm = NULL; bo->ttm = NULL;
spin_lock(&glob->lru_lock);
} }
ttm_bo_mem_put_locked(bo, &bo->mem); ttm_bo_mem_put(bo, &bo->mem);
atomic_set(&bo->reserved, 0); atomic_set(&bo->reserved, 0);
wake_up_all(&bo->event_queue); wake_up_all(&bo->event_queue);
spin_unlock(&glob->lru_lock);
} }
@@ -528,7 +517,7 @@ retry:
list_del_init(&bo->ddestroy); list_del_init(&bo->ddestroy);
++put_count; ++put_count;
} }
spin_unlock(&glob->lru_lock);
ttm_bo_cleanup_memtype_use(bo); ttm_bo_cleanup_memtype_use(bo);
while (put_count--) while (put_count--)
@@ -784,15 +773,6 @@ void ttm_bo_mem_put(struct ttm_buffer_object *bo, struct ttm_mem_reg *mem)
} }
EXPORT_SYMBOL(ttm_bo_mem_put); EXPORT_SYMBOL(ttm_bo_mem_put);
void ttm_bo_mem_put_locked(struct ttm_buffer_object *bo, struct ttm_mem_reg *mem)
{
struct ttm_mem_type_manager *man = &bo->bdev->man[mem->mem_type];
if (mem->mm_node)
(*man->func->put_node_locked)(man, mem);
}
EXPORT_SYMBOL(ttm_bo_mem_put_locked);
/** /**
* Repeatedly evict memory from the LRU for @mem_type until we create enough * Repeatedly evict memory from the LRU for @mem_type until we create enough
* space, or we've evicted everything and there isn't enough space. * space, or we've evicted everything and there isn't enough space.

10
drivers/gpu/drm/ttm/ttm_bo_manager.c
View File

@@ -90,15 +90,6 @@ 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, static int ttm_bo_man_init(struct ttm_mem_type_manager *man,
unsigned long p_size) unsigned long p_size)
{ {
@@ -152,7 +143,6 @@ const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
ttm_bo_man_takedown, ttm_bo_man_takedown,
ttm_bo_man_get_node, ttm_bo_man_get_node,
ttm_bo_man_put_node, ttm_bo_man_put_node,
ttm_bo_man_put_node_locked,
ttm_bo_man_debug ttm_bo_man_debug
}; };
EXPORT_SYMBOL(ttm_bo_manager_func); EXPORT_SYMBOL(ttm_bo_manager_func);

2
include/drm/ttm/ttm_bo_driver.h
View File

@@ -214,8 +214,6 @@ struct ttm_mem_type_manager_func {
struct ttm_mem_reg *mem); struct ttm_mem_reg *mem);
void (*put_node)(struct ttm_mem_type_manager *man, void (*put_node)(struct ttm_mem_type_manager *man,
struct ttm_mem_reg *mem); 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); void (*debug)(struct ttm_mem_type_manager *man, const char *prefix);
}; };