Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

+2 -5
-1
drivers/gpu/drm/nouveau/core/core/mm.c
··· 208 208 struct nouveau_mm_node *node; 209 209 210 210 if (block) { 211 - mutex_init(&mm->mutex); 212 211 INIT_LIST_HEAD(&mm->nodes); 213 212 INIT_LIST_HEAD(&mm->free); 214 213 mm->block_size = block;
-2
drivers/gpu/drm/nouveau/core/include/core/mm.h
··· 15 15 struct list_head nodes; 16 16 struct list_head free; 17 17 18 - struct mutex mutex; 19 - 20 18 u32 block_size; 21 19 int heap_nodes; 22 20 };
+2 -2
drivers/gpu/drm/nouveau/nouveau_ttm.c
··· 111 111 struct nouveau_mm_node *r; 112 112 u32 total = 0, free = 0; 113 113 114 - mutex_lock(&mm->mutex); 114 + mutex_lock(&nv_subdev(pfb)->mutex); 115 115 list_for_each_entry(r, &mm->nodes, nl_entry) { 116 116 printk(KERN_DEBUG "%s %d: 0x%010llx 0x%010llx\n", 117 117 prefix, r->type, ((u64)r->offset << 12), ··· 121 121 if (!r->type) 122 122 free += r->length; 123 123 } 124 - mutex_unlock(&mm->mutex); 124 + mutex_unlock(&nv_subdev(pfb)->mutex); 125 125 126 126 printk(KERN_DEBUG "%s total: 0x%010llx free: 0x%010llx\n", 127 127 prefix, (u64)total << 12, (u64)free << 12);