drm: move ttm global code to core drm

I wrote this for the prime sharing work, but I also noticed other external
non-upstream drivers from a large company carrying a similiar patch, so I
may as well ship it in master.

Signed-off-by: Dave Airlie <airlied@redhat.com>

12 files changed, 53 insertions, 56 deletions

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index df8f92322865..f3a23a329f4e 100644
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -12,7 +12,7 @@ drm-y       :=	drm_auth.o drm_buffer.o drm_bufs.o drm_cache.o \
                 drm_platform.o drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o \
                 drm_crtc.o drm_modes.o drm_edid.o \
                 drm_info.o drm_debugfs.o drm_encoder_slave.o \
-                drm_trace_points.o
+                drm_trace_points.o drm_global.o
 
 drm-$(CONFIG_COMPAT) += drm_ioc32.o
 
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index b5a51686f492..d5b349d279f5 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -288,6 +288,7 @@ static int __init drm_core_init(void)
 {
         int ret = -ENOMEM;
 
+        drm_global_init();
         idr_init(&drm_minors_idr);
 
         if (register_chrdev(DRM_MAJOR, "drm", &drm_stub_fops))
diff --git a/drivers/gpu/drm/ttm/ttm_global.c b/drivers/gpu/drm/drm_global.c
index b17007178a36..c87dc96444de 100644
--- a/drivers/gpu/drm/ttm/ttm_global.c
+++ b/drivers/gpu/drm/drm_global.c
@@ -28,45 +28,45 @@
  * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
  */
 
-#include "ttm/ttm_module.h"
 #include <linux/mutex.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+#include "drm_global.h"
 
-struct ttm_global_item {
+struct drm_global_item {
         struct mutex mutex;
         void *object;
         int refcount;
 };
 
-static struct ttm_global_item glob[TTM_GLOBAL_NUM];
+static struct drm_global_item glob[DRM_GLOBAL_NUM];
 
-void ttm_global_init(void)
+void drm_global_init(void)
 {
         int i;
 
-        for (i = 0; i < TTM_GLOBAL_NUM; ++i) {
-                struct ttm_global_item *item = &glob[i];
+        for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
+                struct drm_global_item *item = &glob[i];
                 mutex_init(&item->mutex);
                 item->object = NULL;
                 item->refcount = 0;
         }
 }
 
-void ttm_global_release(void)
+void drm_global_release(void)
 {
         int i;
-        for (i = 0; i < TTM_GLOBAL_NUM; ++i) {
-                struct ttm_global_item *item = &glob[i];
+        for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
+                struct drm_global_item *item = &glob[i];
                 BUG_ON(item->object != NULL);
                 BUG_ON(item->refcount != 0);
         }
 }
 
-int ttm_global_item_ref(struct ttm_global_reference *ref)
+int drm_global_item_ref(struct drm_global_reference *ref)
 {
         int ret;
-        struct ttm_global_item *item = &glob[ref->global_type];
+        struct drm_global_item *item = &glob[ref->global_type];
         void *object;
 
         mutex_lock(&item->mutex);
@@ -93,11 +93,11 @@ out_err:
         item->object = NULL;
         return ret;
 }
-EXPORT_SYMBOL(ttm_global_item_ref);
+EXPORT_SYMBOL(drm_global_item_ref);
 
-void ttm_global_item_unref(struct ttm_global_reference *ref)
+void drm_global_item_unref(struct drm_global_reference *ref)
 {
-        struct ttm_global_item *item = &glob[ref->global_type];
+        struct drm_global_item *item = &glob[ref->global_type];
 
         mutex_lock(&item->mutex);
         BUG_ON(item->refcount == 0);
@@ -108,5 +108,5 @@ void ttm_global_item_unref(struct ttm_global_reference *ref)
         }
         mutex_unlock(&item->mutex);
 }
-EXPORT_SYMBOL(ttm_global_item_unref);
+EXPORT_SYMBOL(drm_global_item_unref);
 
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index d0a35d9ba522..e15db15dca77 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -533,7 +533,7 @@ struct drm_nouveau_private {
         struct list_head vbl_waiting;
 
         struct {
-                struct ttm_global_reference mem_global_ref;
+                struct drm_global_reference mem_global_ref;
                 struct ttm_bo_global_ref bo_global_ref;
                 struct ttm_bo_device bdev;
                 spinlock_t bo_list_lock;
diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index c385d50f041b..bd35f930568c 100644
--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
@@ -42,13 +42,13 @@ nouveau_ttm_mmap(struct file *filp, struct vm_area_struct *vma)
 }
 
 static int
-nouveau_ttm_mem_global_init(struct ttm_global_reference *ref)
+nouveau_ttm_mem_global_init(struct drm_global_reference *ref)
 {
         return ttm_mem_global_init(ref->object);
 }
 
 static void
-nouveau_ttm_mem_global_release(struct ttm_global_reference *ref)
+nouveau_ttm_mem_global_release(struct drm_global_reference *ref)
 {
         ttm_mem_global_release(ref->object);
 }
@@ -56,16 +56,16 @@ nouveau_ttm_mem_global_release(struct ttm_global_reference *ref)
 int
 nouveau_ttm_global_init(struct drm_nouveau_private *dev_priv)
 {
-        struct ttm_global_reference *global_ref;
+        struct drm_global_reference *global_ref;
         int ret;
 
         global_ref = &dev_priv->ttm.mem_global_ref;
-        global_ref->global_type = TTM_GLOBAL_TTM_MEM;
+        global_ref->global_type = DRM_GLOBAL_TTM_MEM;
         global_ref->size = sizeof(struct ttm_mem_global);
         global_ref->init = &nouveau_ttm_mem_global_init;
         global_ref->release = &nouveau_ttm_mem_global_release;
 
-        ret = ttm_global_item_ref(global_ref);
+        ret = drm_global_item_ref(global_ref);
         if (unlikely(ret != 0)) {
                 DRM_ERROR("Failed setting up TTM memory accounting\n");
                 dev_priv->ttm.mem_global_ref.release = NULL;
@@ -74,15 +74,15 @@ nouveau_ttm_global_init(struct drm_nouveau_private *dev_priv)
 
         dev_priv->ttm.bo_global_ref.mem_glob = global_ref->object;
         global_ref = &dev_priv->ttm.bo_global_ref.ref;
-        global_ref->global_type = TTM_GLOBAL_TTM_BO;
+        global_ref->global_type = DRM_GLOBAL_TTM_BO;
         global_ref->size = sizeof(struct ttm_bo_global);
         global_ref->init = &ttm_bo_global_init;
         global_ref->release = &ttm_bo_global_release;
 
-        ret = ttm_global_item_ref(global_ref);
+        ret = drm_global_item_ref(global_ref);
         if (unlikely(ret != 0)) {
                 DRM_ERROR("Failed setting up TTM BO subsystem\n");
-                ttm_global_item_unref(&dev_priv->ttm.mem_global_ref);
+                drm_global_item_unref(&dev_priv->ttm.mem_global_ref);
                 dev_priv->ttm.mem_global_ref.release = NULL;
                 return ret;
         }
@@ -96,8 +96,8 @@ nouveau_ttm_global_release(struct drm_nouveau_private *dev_priv)
         if (dev_priv->ttm.mem_global_ref.release == NULL)
                 return;
 
-        ttm_global_item_unref(&dev_priv->ttm.bo_global_ref.ref);
-        ttm_global_item_unref(&dev_priv->ttm.mem_global_ref);
+        drm_global_item_unref(&dev_priv->ttm.bo_global_ref.ref);
+        drm_global_item_unref(&dev_priv->ttm.mem_global_ref);
         dev_priv->ttm.mem_global_ref.release = NULL;
 }
 
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 368fecf0c2b7..3cd1c470b777 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -235,7 +235,7 @@ struct radeon_surface_reg {
  */
 struct radeon_mman {
         struct ttm_bo_global_ref        bo_global_ref;
-        struct ttm_global_reference     mem_global_ref;
+        struct drm_global_reference     mem_global_ref;
         struct ttm_bo_device            bdev;
         bool                            mem_global_referenced;
         bool                            initialized;
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index e9918d88f5b0..84c53e41a88f 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -59,28 +59,28 @@ static struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev)
 /*
  * Global memory.
  */
-static int radeon_ttm_mem_global_init(struct ttm_global_reference *ref)
+static int radeon_ttm_mem_global_init(struct drm_global_reference *ref)
 {
         return ttm_mem_global_init(ref->object);
 }
 
-static void radeon_ttm_mem_global_release(struct ttm_global_reference *ref)
+static void radeon_ttm_mem_global_release(struct drm_global_reference *ref)
 {
         ttm_mem_global_release(ref->object);
 }
 
 static int radeon_ttm_global_init(struct radeon_device *rdev)
 {
-        struct ttm_global_reference *global_ref;
+        struct drm_global_reference *global_ref;
         int r;
 
         rdev->mman.mem_global_referenced = false;
         global_ref = &rdev->mman.mem_global_ref;
-        global_ref->global_type = TTM_GLOBAL_TTM_MEM;
+        global_ref->global_type = DRM_GLOBAL_TTM_MEM;
         global_ref->size = sizeof(struct ttm_mem_global);
         global_ref->init = &radeon_ttm_mem_global_init;
         global_ref->release = &radeon_ttm_mem_global_release;
-        r = ttm_global_item_ref(global_ref);
+        r = drm_global_item_ref(global_ref);
         if (r != 0) {
                 DRM_ERROR("Failed setting up TTM memory accounting "
                           "subsystem.\n");
@@ -90,14 +90,14 @@ static int radeon_ttm_global_init(struct radeon_device *rdev)
         rdev->mman.bo_global_ref.mem_glob =
                 rdev->mman.mem_global_ref.object;
         global_ref = &rdev->mman.bo_global_ref.ref;
-        global_ref->global_type = TTM_GLOBAL_TTM_BO;
+        global_ref->global_type = DRM_GLOBAL_TTM_BO;
         global_ref->size = sizeof(struct ttm_bo_global);
         global_ref->init = &ttm_bo_global_init;
         global_ref->release = &ttm_bo_global_release;
-        r = ttm_global_item_ref(global_ref);
+        r = drm_global_item_ref(global_ref);
         if (r != 0) {
                 DRM_ERROR("Failed setting up TTM BO subsystem.\n");
-                ttm_global_item_unref(&rdev->mman.mem_global_ref);
+                drm_global_item_unref(&rdev->mman.mem_global_ref);
                 return r;
         }
 
@@ -108,8 +108,8 @@ static int radeon_ttm_global_init(struct radeon_device *rdev)
 static void radeon_ttm_global_fini(struct radeon_device *rdev)
 {
         if (rdev->mman.mem_global_referenced) {
-                ttm_global_item_unref(&rdev->mman.bo_global_ref.ref);
-                ttm_global_item_unref(&rdev->mman.mem_global_ref);
+                drm_global_item_unref(&rdev->mman.bo_global_ref.ref);
+                drm_global_item_unref(&rdev->mman.mem_global_ref);
                 rdev->mman.mem_global_referenced = false;
         }
 }
diff --git a/drivers/gpu/drm/ttm/Makefile b/drivers/gpu/drm/ttm/Makefile
index 4256e2006476..b256d4adfafe 100644
--- a/drivers/gpu/drm/ttm/Makefile
+++ b/drivers/gpu/drm/ttm/Makefile
@@ -3,7 +3,7 @@
 
 ccflags-y := -Iinclude/drm
 ttm-y := ttm_agp_backend.o ttm_memory.o ttm_tt.o ttm_bo.o \
-        ttm_bo_util.o ttm_bo_vm.o ttm_module.o ttm_global.o \
+        ttm_bo_util.o ttm_bo_vm.o ttm_module.o \
         ttm_object.o ttm_lock.o ttm_execbuf_util.o ttm_page_alloc.o
 
 obj-$(CONFIG_DRM_TTM) += ttm.o
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
index 9763288c6b2d..cb4cf7ef4d1e 100644
--- a/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1395,7 +1395,7 @@ static void ttm_bo_global_kobj_release(struct kobject *kobj)
         kfree(glob);
 }
 
-void ttm_bo_global_release(struct ttm_global_reference *ref)
+void ttm_bo_global_release(struct drm_global_reference *ref)
 {
         struct ttm_bo_global *glob = ref->object;
 
@@ -1404,7 +1404,7 @@ void ttm_bo_global_release(struct ttm_global_reference *ref)
 }
 EXPORT_SYMBOL(ttm_bo_global_release);
 
-int ttm_bo_global_init(struct ttm_global_reference *ref)
+int ttm_bo_global_init(struct drm_global_reference *ref)
 {
         struct ttm_bo_global_ref *bo_ref =
                 container_of(ref, struct ttm_bo_global_ref, ref);
diff --git a/drivers/gpu/drm/ttm/ttm_module.c b/drivers/gpu/drm/ttm/ttm_module.c
index 9a6edbfeaa9e..902d7cf9fb4e 100644
--- a/drivers/gpu/drm/ttm/ttm_module.c
+++ b/drivers/gpu/drm/ttm/ttm_module.c
@@ -70,8 +70,6 @@ static int __init ttm_init(void)
         if (unlikely(ret != 0))
                 return ret;
 
-        ttm_global_init();
-
         atomic_set(&device_released, 0);
         ret = drm_class_device_register(&ttm_drm_class_device);
         if (unlikely(ret != 0))
@@ -81,7 +79,6 @@ static int __init ttm_init(void)
 out_no_dev_reg:
         atomic_set(&device_released, 1);
         wake_up_all(&exit_q);
-        ttm_global_release();
         return ret;
 }
 
@@ -95,7 +92,6 @@ static void __exit ttm_exit(void)
          */
 
         wait_event(exit_q, atomic_read(&device_released) == 1);
-        ttm_global_release();
 }
 
 module_init(ttm_init);
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index eaad52095339..429f917b60bf 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -164,7 +164,7 @@ struct vmw_vga_topology_state {
 struct vmw_private {
         struct ttm_bo_device bdev;
         struct ttm_bo_global_ref bo_global_ref;
-        struct ttm_global_reference mem_global_ref;
+        struct drm_global_reference mem_global_ref;
 
         struct vmw_fifo_state fifo;
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
index e3df4adfb4d8..83123287c60c 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c
@@ -44,29 +44,29 @@ int vmw_mmap(struct file *filp, struct vm_area_struct *vma)
         return ttm_bo_mmap(filp, vma, &dev_priv->bdev);
 }
 
-static int vmw_ttm_mem_global_init(struct ttm_global_reference *ref)
+static int vmw_ttm_mem_global_init(struct drm_global_reference *ref)
 {
         DRM_INFO("global init.\n");
         return ttm_mem_global_init(ref->object);
 }
 
-static void vmw_ttm_mem_global_release(struct ttm_global_reference *ref)
+static void vmw_ttm_mem_global_release(struct drm_global_reference *ref)
 {
         ttm_mem_global_release(ref->object);
 }
 
 int vmw_ttm_global_init(struct vmw_private *dev_priv)
 {
-        struct ttm_global_reference *global_ref;
+        struct drm_global_reference *global_ref;
         int ret;
 
         global_ref = &dev_priv->mem_global_ref;
-        global_ref->global_type = TTM_GLOBAL_TTM_MEM;
+        global_ref->global_type = DRM_GLOBAL_TTM_MEM;
         global_ref->size = sizeof(struct ttm_mem_global);
         global_ref->init = &vmw_ttm_mem_global_init;
         global_ref->release = &vmw_ttm_mem_global_release;
 
-        ret = ttm_global_item_ref(global_ref);
+        ret = drm_global_item_ref(global_ref);
         if (unlikely(ret != 0)) {
                 DRM_ERROR("Failed setting up TTM memory accounting.\n");
                 return ret;
@@ -75,11 +75,11 @@ int vmw_ttm_global_init(struct vmw_private *dev_priv)
         dev_priv->bo_global_ref.mem_glob =
                 dev_priv->mem_global_ref.object;
         global_ref = &dev_priv->bo_global_ref.ref;
-        global_ref->global_type = TTM_GLOBAL_TTM_BO;
+        global_ref->global_type = DRM_GLOBAL_TTM_BO;
         global_ref->size = sizeof(struct ttm_bo_global);
         global_ref->init = &ttm_bo_global_init;
         global_ref->release = &ttm_bo_global_release;
-                ret = ttm_global_item_ref(global_ref);
+        ret = drm_global_item_ref(global_ref);
 
         if (unlikely(ret != 0)) {
                 DRM_ERROR("Failed setting up TTM buffer objects.\n");
@@ -88,12 +88,12 @@ int vmw_ttm_global_init(struct vmw_private *dev_priv)
 
         return 0;
 out_no_bo:
-        ttm_global_item_unref(&dev_priv->mem_global_ref);
+        drm_global_item_unref(&dev_priv->mem_global_ref);
         return ret;
 }
 
 void vmw_ttm_global_release(struct vmw_private *dev_priv)
 {
-        ttm_global_item_unref(&dev_priv->bo_global_ref.ref);
-        ttm_global_item_unref(&dev_priv->mem_global_ref);
+        drm_global_item_unref(&dev_priv->bo_global_ref.ref);
+        drm_global_item_unref(&dev_priv->mem_global_ref);
 }