1 files changed, 0 insertions, 65 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index cbb67e9ffb3a..9920a6fc11bf 100644
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -60,65 +60,6 @@ static struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev)
         return rdev;
 }
 
-
-/*
- * Global memory.
- */
-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 drm_global_reference *ref)
-{
-        ttm_mem_global_release(ref->object);
-}
-
-static int radeon_ttm_global_init(struct radeon_device *rdev)
-{
-        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 = 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 = drm_global_item_ref(global_ref);
-        if (r != 0) {
-                DRM_ERROR("Failed setting up TTM memory accounting "
-                          "subsystem.\n");
-                return r;
-        }
-
-        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 = 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 = drm_global_item_ref(global_ref);
-        if (r != 0) {
-                DRM_ERROR("Failed setting up TTM BO subsystem.\n");
-                drm_global_item_unref(&rdev->mman.mem_global_ref);
-                return r;
-        }
-
-        rdev->mman.mem_global_referenced = true;
-        return 0;
-}
-
-static void radeon_ttm_global_fini(struct radeon_device *rdev)
-{
-        if (rdev->mman.mem_global_referenced) {
-                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;
-        }
-}
-
 static int radeon_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags)
 {
         return 0;
@@ -847,13 +788,8 @@ int radeon_ttm_init(struct radeon_device *rdev)
 {
         int r;
 
-        r = radeon_ttm_global_init(rdev);
-        if (r) {
-                return r;
-        }
         /* No others user of address space so set it to 0 */
         r = ttm_bo_device_init(&rdev->mman.bdev,
-                               rdev->mman.bo_global_ref.ref.object,
                                &radeon_bo_driver,
                                rdev->ddev->anon_inode->i_mapping,
                                DRM_FILE_PAGE_OFFSET,
@@ -925,7 +861,6 @@ void radeon_ttm_fini(struct radeon_device *rdev)
         ttm_bo_clean_mm(&rdev->mman.bdev, TTM_PL_TT);
         ttm_bo_device_release(&rdev->mman.bdev);
         radeon_gart_fini(rdev);
-        radeon_ttm_global_fini(rdev);
         rdev->mman.initialized = false;
         DRM_INFO("radeon: ttm finalized\n");
 }