Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27eb1fa9 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

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: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarJunwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7e07834c

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+0 −44
Original line number Diff line number Diff line
@@ -65,33 +65,6 @@ static void amdgpu_ttm_debugfs_fini(struct amdgpu_device *adev); 
 * Global memory.

 */



/**

 * amdgpu_ttm_mem_global_init - Initialize and acquire reference to

 * memory object

 *

 * @ref: Object for initialization.

 *

 * This is called by drm_global_item_ref() when an object is being

 * initialized.

 */

static int amdgpu_ttm_mem_global_init(struct drm_global_reference *ref)

{

	return ttm_mem_global_init(ref->object);

}



/**

 * amdgpu_ttm_mem_global_release - Drop reference to a memory object

 *

 * @ref: Object being removed

 *

 * This is called by drm_global_item_unref() when an object is being

 * released.

 */

static void amdgpu_ttm_mem_global_release(struct drm_global_reference *ref)

{

	ttm_mem_global_release(ref->object);

}



/**

 * amdgpu_ttm_global_init - Initialize global TTM memory reference structures.

 *
@@ -108,20 +81,6 @@ static int amdgpu_ttm_global_init(struct amdgpu_device *adev) 
	/* ensure reference is false in case init fails */

	adev->mman.mem_global_referenced = false;



	global_ref = &adev->mman.mem_global_ref;

	global_ref->global_type = DRM_GLOBAL_TTM_MEM;

	global_ref->size = sizeof(struct ttm_mem_global);

	global_ref->init = &amdgpu_ttm_mem_global_init;

	global_ref->release = &amdgpu_ttm_mem_global_release;

	r = drm_global_item_ref(global_ref);

	if (r) {

		DRM_ERROR("Failed setting up TTM memory accounting "

			  "subsystem.\n");

		goto error_mem;

	}



	adev->mman.bo_global_ref.mem_glob =

		adev->mman.mem_global_ref.object;

	global_ref = &adev->mman.bo_global_ref.ref;

	global_ref->global_type = DRM_GLOBAL_TTM_BO;

	global_ref->size = sizeof(struct ttm_bo_global);
@@ -140,8 +99,6 @@ static int amdgpu_ttm_global_init(struct amdgpu_device *adev) 
	return 0;



error_bo:

	drm_global_item_unref(&adev->mman.mem_global_ref);

error_mem:

	return r;

}
@@ -150,7 +107,6 @@ static void amdgpu_ttm_global_fini(struct amdgpu_device *adev) 
	if (adev->mman.mem_global_referenced) {

		mutex_destroy(&adev->mman.gtt_window_lock);

		drm_global_item_unref(&adev->mman.bo_global_ref.ref);

		drm_global_item_unref(&adev->mman.mem_global_ref);

		adev->mman.mem_global_referenced = false;

	}

}

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 


struct amdgpu_mman {

	struct ttm_bo_global_ref        bo_global_ref;

	struct drm_global_reference	mem_global_ref;

	struct ttm_bo_device		bdev;

	bool				mem_global_referenced;

	bool				initialized;

drivers/gpu/drm/ast/ast_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/ast/ast_ttm.c

+2 −30
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/bochs/bochs.h

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ struct bochs_device { 


	/* ttm */

	struct {

		struct drm_global_reference mem_global_ref;

		struct ttm_bo_global_ref bo_global_ref;

		struct ttm_bo_device bdev;

		bool initialized;