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>

1 files changed, 10 insertions, 10 deletions

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);
 }