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

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

drm/ttm: initialize globals during device init (v2) 



Make sure that the global BO state is always correctly initialized.

This allows removing all the device code to initialize it.

v2: fix up vbox (Alex)

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 62b53b37

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

+2 −57
Original line number Diff line number Diff line
@@ -61,56 +61,6 @@ static int amdgpu_map_buffer(struct ttm_buffer_object *bo, 
static int amdgpu_ttm_debugfs_init(struct amdgpu_device *adev);

static void amdgpu_ttm_debugfs_fini(struct amdgpu_device *adev);



/*

 * Global memory.

 */



/**

 * amdgpu_ttm_global_init - Initialize global TTM memory reference structures.

 *

 * @adev: AMDGPU device for which the global structures need to be registered.

 *

 * This is called as part of the AMDGPU ttm init from amdgpu_ttm_init()

 * during bring up.

 */

static int amdgpu_ttm_global_init(struct amdgpu_device *adev)

{

	struct drm_global_reference *global_ref;

	int r;



	/* ensure reference is false in case init fails */

	adev->mman.mem_global_referenced = false;



	global_ref = &adev->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_ref_init;

	global_ref->release = &ttm_bo_global_ref_release;

	r = drm_global_item_ref(global_ref);

	if (r) {

		DRM_ERROR("Failed setting up TTM BO subsystem.\n");

		goto error_bo;

	}



	mutex_init(&adev->mman.gtt_window_lock);



	adev->mman.mem_global_referenced = true;



	return 0;



error_bo:

	return r;

}



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

		adev->mman.mem_global_referenced = false;

	}

}



static int amdgpu_invalidate_caches(struct ttm_bo_device *bdev, uint32_t flags)

{

	return 0;
@@ -1714,14 +1664,10 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) 
	int r;

	u64 vis_vram_limit;



	/* initialize global references for vram/gtt */

	r = amdgpu_ttm_global_init(adev);

	if (r) {

		return r;

	}

	mutex_init(&adev->mman.gtt_window_lock);



	/* No others user of address space so set it to 0 */

	r = ttm_bo_device_init(&adev->mman.bdev,

			       adev->mman.bo_global_ref.ref.object,

			       &amdgpu_bo_driver,

			       adev->ddev->anon_inode->i_mapping,

			       DRM_FILE_PAGE_OFFSET,
@@ -1878,7 +1824,6 @@ void amdgpu_ttm_fini(struct amdgpu_device *adev) 
	ttm_bo_clean_mm(&adev->mman.bdev, AMDGPU_PL_GWS);

	ttm_bo_clean_mm(&adev->mman.bdev, AMDGPU_PL_OA);

	ttm_bo_device_release(&adev->mman.bdev);

	amdgpu_ttm_global_fini(adev);

	adev->mman.initialized = false;

	DRM_INFO("amdgpu: ttm finalized\n");

}

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

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#define AMDGPU_GTT_NUM_TRANSFER_WINDOWS	2



struct amdgpu_mman {

	struct ttm_bo_global_ref        bo_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 ttm_bo_global_ref bo_global_ref;

		struct ttm_bo_device bdev;

	} ttm;

drivers/gpu/drm/ast/ast_ttm.c

+0 −36
Original line number Diff line number Diff line
@@ -36,35 +36,6 @@ ast_bdev(struct ttm_bo_device *bd) 
	return container_of(bd, struct ast_private, ttm.bdev);

}



static int ast_ttm_global_init(struct ast_private *ast)

{

	struct drm_global_reference *global_ref;

	int r;



	global_ref = &ast->ttm.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_ref_init;

	global_ref->release = &ttm_bo_global_ref_release;

	r = drm_global_item_ref(global_ref);

	if (r != 0) {

		DRM_ERROR("Failed setting up TTM BO subsystem.\n");

		return r;

	}

	return 0;

}



static void

ast_ttm_global_release(struct ast_private *ast)

{

	if (ast->ttm.bo_global_ref.ref.release == NULL)

		return;



	drm_global_item_unref(&ast->ttm.bo_global_ref.ref);

	ast->ttm.bo_global_ref.ref.release = NULL;

}





static void ast_bo_ttm_destroy(struct ttm_buffer_object *tbo)

{

	struct ast_bo *bo;
@@ -204,12 +175,7 @@ int ast_mm_init(struct ast_private *ast) 
	struct drm_device *dev = ast->dev;

	struct ttm_bo_device *bdev = &ast->ttm.bdev;



	ret = ast_ttm_global_init(ast);

	if (ret)

		return ret;



	ret = ttm_bo_device_init(&ast->ttm.bdev,

				 ast->ttm.bo_global_ref.ref.object,

				 &ast_bo_driver,

				 dev->anon_inode->i_mapping,

				 DRM_FILE_PAGE_OFFSET,
@@ -240,8 +206,6 @@ void ast_mm_fini(struct ast_private *ast) 


	ttm_bo_device_release(&ast->ttm.bdev);



	ast_ttm_global_release(ast);



	arch_phys_wc_del(ast->fb_mtrr);

	arch_io_free_memtype_wc(pci_resource_start(dev->pdev, 0),

				pci_resource_len(dev->pdev, 0));

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 ttm_bo_global_ref bo_global_ref;

		struct ttm_bo_device bdev;

		bool initialized;

	} ttm;