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

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

diff --git a/drivers/gpu/drm/nouveau/core/core/mm.c b/drivers/gpu/drm/nouveau/core/core/mm.c
index 0261a11b2ae03e2f054f8017ffe29b2724d56120..d8291724dbd47d53ff6edc48a12ad669e5c68d8c 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/core/mm.c
+++ b/drivers/gpu/drm/nouveau/core/core/mm.c
@@ -208,7 +208,6 @@ nouveau_mm_init(struct nouveau_mm *mm, u32 offset, u32 length, u32 block)
        struct nouveau_mm_node *node;
 
        if (block) {
-               mutex_init(&mm->mutex);
                INIT_LIST_HEAD(&mm->nodes);
                INIT_LIST_HEAD(&mm->free);
                mm->block_size = block;

diff --git a/drivers/gpu/drm/nouveau/core/include/core/mm.h b/drivers/gpu/drm/nouveau/core/include/core/mm.h
index 2514e81ade0220f83e7cdfecc4dc19a7177df062..2bf7d0e322611c18842b1a1c4f95c47d018c3f92 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/include/core/mm.h
+++ b/drivers/gpu/drm/nouveau/core/include/core/mm.h
@@ -15,8 +15,6 @@ struct nouveau_mm {
        struct list_head nodes;
        struct list_head free;
 
-       struct mutex mutex;
-
        u32 block_size;
        int heap_nodes;
 };

diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index 2311b7aca2d4c33565932fde5070253d3fd324eb..01e3154f896927013567aaf444d80f7caa3b7e81 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -111,7 +111,7 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
        struct nouveau_mm_node *r;
        u32 total = 0, free = 0;
 
-       mutex_lock(&mm->mutex);
+       mutex_lock(&nv_subdev(pfb)->mutex);
        list_for_each_entry(r, &mm->nodes, nl_entry) {
                printk(KERN_DEBUG "%s %d: 0x%010llx 0x%010llx\n",
                       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)
                        free += r->length;
        }
-       mutex_unlock(&mm->mutex);
+       mutex_unlock(&nv_subdev(pfb)->mutex);
 
        printk(KERN_DEBUG "%s  total: 0x%010llx free: 0x%010llx\n",
               prefix, (u64)total << 12, (u64)free << 12);