drm: move ttm global code to core drm

[mv-sheeva.git] / drivers / gpu / drm / nouveau / nouveau_ttm.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
index c385d50f041b0f6ecf6e08cb6c58effba677c942..bd35f930568c922b9b275aa3de418c502e543e7f 100644 (file)
--- 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;
 }