UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/nouveau/core: remove nouveau_mm.mutex, no more users 

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2013-05-13 22:30:56 +10:00
parent 4e67bee8e1
commit 51a506c012
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/core/core/mm.c
View File

@ -208,7 +208,6 @@ nouveau_mm_init(struct nouveau_mm *mm, u32 offset, u32 length, u32 block)
struct nouveau_mm_node *node; struct nouveau_mm_node *node;
if (block) { if (block) {
mutex_init(&mm->mutex);
INIT_LIST_HEAD(&mm->nodes); INIT_LIST_HEAD(&mm->nodes);
INIT_LIST_HEAD(&mm->free); INIT_LIST_HEAD(&mm->free);
mm->block_size = block; mm->block_size = block;

2
drivers/gpu/drm/nouveau/core/include/core/mm.h
View File

@ -15,8 +15,6 @@ struct nouveau_mm {
struct list_head nodes; struct list_head nodes;
struct list_head free; struct list_head free;
struct mutex mutex;
u32 block_size; u32 block_size;
int heap_nodes; int heap_nodes;
}; };

4
drivers/gpu/drm/nouveau/nouveau_ttm.c
View File

@ -111,7 +111,7 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
struct nouveau_mm_node *r; struct nouveau_mm_node *r;
u32 total = 0, free = 0; u32 total = 0, free = 0;
mutex_lock(&mm->mutex); mutex_lock(&nv_subdev(pfb)->mutex);
list_for_each_entry(r, &mm->nodes, nl_entry) { list_for_each_entry(r, &mm->nodes, nl_entry) {
printk(KERN_DEBUG "%s %d: 0x%010llx 0x%010llx\n", printk(KERN_DEBUG "%s %d: 0x%010llx 0x%010llx\n",
prefix, r->type, ((u64)r->offset << 12), prefix, r->type, ((u64)r->offset << 12),
@ -121,7 +121,7 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
if (!r->type) if (!r->type)
free += r->length; free += r->length;
} }
mutex_unlock(&mm->mutex); mutex_unlock(&nv_subdev(pfb)->mutex);
printk(KERN_DEBUG "%s total: 0x%010llx free: 0x%010llx\n", printk(KERN_DEBUG "%s total: 0x%010llx free: 0x%010llx\n",
prefix, (u64)total << 12, (u64)free << 12); prefix, (u64)total << 12, (u64)free << 12);