drm/ttm: use a static ttm_mem_global instance

As the name says we only need one global instance of ttm_mem_global.

Drop all the driver initialization and just use a single exported
instance which is initialized during BO global initialization.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

2 files changed, 2 insertions, 31 deletions

diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h
index e6c4cd3dc50e..6ae11a477643 100644
--- a/drivers/gpu/drm/ast/ast_drv.h
+++ b/drivers/gpu/drm/ast/ast_drv.h
@@ -104,7 +104,6 @@ struct ast_private {
         int fb_mtrr;
 
         struct {
-                struct drm_global_reference mem_global_ref;
                 struct ttm_bo_global_ref bo_global_ref;
                 struct ttm_bo_device bdev;
         } ttm;
diff --git a/drivers/gpu/drm/ast/ast_ttm.c b/drivers/gpu/drm/ast/ast_ttm.c
index d21fbd26785a..8a59d6fc1160 100644
--- a/drivers/gpu/drm/ast/ast_ttm.c
+++ b/drivers/gpu/drm/ast/ast_ttm.c
@@ -36,37 +36,11 @@ ast_bdev(struct ttm_bo_device *bd)
         return container_of(bd, struct ast_private, ttm.bdev);
 }
 
-static int
-ast_ttm_mem_global_init(struct drm_global_reference *ref)
-{
-        return ttm_mem_global_init(ref->object);
-}
-
-static void
-ast_ttm_mem_global_release(struct drm_global_reference *ref)
-{
-        ttm_mem_global_release(ref->object);
-}
-
 static int ast_ttm_global_init(struct ast_private *ast)
 {
         struct drm_global_reference *global_ref;
         int r;
 
-        global_ref = &ast->ttm.mem_global_ref;
-        global_ref->global_type = DRM_GLOBAL_TTM_MEM;
-        global_ref->size = sizeof(struct ttm_mem_global);
-        global_ref->init = &ast_ttm_mem_global_init;
-        global_ref->release = &ast_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;
-        }
-
-        ast->ttm.bo_global_ref.mem_glob =
-                ast->ttm.mem_global_ref.object;
         global_ref = &ast->ttm.bo_global_ref.ref;
         global_ref->global_type = DRM_GLOBAL_TTM_BO;
         global_ref->size = sizeof(struct ttm_bo_global);
@@ -75,7 +49,6 @@ static int ast_ttm_global_init(struct ast_private *ast)
         r = drm_global_item_ref(global_ref);
         if (r != 0) {
                 DRM_ERROR("Failed setting up TTM BO subsystem.\n");
-                drm_global_item_unref(&ast->ttm.mem_global_ref);
                 return r;
         }
         return 0;
@@ -84,12 +57,11 @@ static int ast_ttm_global_init(struct ast_private *ast)
 static void
 ast_ttm_global_release(struct ast_private *ast)
 {
-        if (ast->ttm.mem_global_ref.release == NULL)
+        if (ast->ttm.bo_global_ref.ref.release == NULL)
                 return;
 
         drm_global_item_unref(&ast->ttm.bo_global_ref.ref);
-        drm_global_item_unref(&ast->ttm.mem_global_ref);
-        ast->ttm.mem_global_ref.release = NULL;
+        ast->ttm.bo_global_ref.ref.release = NULL;
 }