Commit 23e24fbb authored by Nirmoy Das's avatar Nirmoy Das Committed by Alex Deucher
Browse files

drm/amdgpu: parameterize ttm BO destroy callback 



Make provision to pass different ttm BO destroy callback
while creating a amdgpu_bo.

Signed-off-by: default avatarNirmoy Das <nirmoy.das@amd.com>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 391629bd

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

+30 −11
Original line number Diff line number Diff line
@@ -54,29 +54,40 @@ 


static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev);

	struct amdgpu_bo *bo = ttm_to_amdgpu_bo(tbo);

	struct amdgpu_bo_user *ubo;



	amdgpu_bo_kunmap(bo);



	if (bo->tbo.base.import_attach)

		drm_prime_gem_destroy(&bo->tbo.base, bo->tbo.sg);

	drm_gem_object_release(&bo->tbo.base);

	amdgpu_bo_unref(&bo->parent);

	kvfree(bo);

}



static void amdgpu_bo_user_destroy(struct ttm_buffer_object *tbo)

{

	struct amdgpu_bo *bo = ttm_to_amdgpu_bo(tbo);

	struct amdgpu_bo_user *ubo;



	ubo = to_amdgpu_bo_user(bo);

	kfree(ubo->metadata);

	amdgpu_bo_destroy(tbo);

}



static void amdgpu_bo_vm_destroy(struct ttm_buffer_object *tbo)

{

	struct amdgpu_device *adev = amdgpu_ttm_adev(tbo->bdev);

	struct amdgpu_bo *bo = ttm_to_amdgpu_bo(tbo);



	/* in case amdgpu_device_recover_vram got NULL of bo->parent */

	if (!list_empty(&bo->shadow_list)) {

		mutex_lock(&adev->shadow_list_lock);

		list_del_init(&bo->shadow_list);

		mutex_unlock(&adev->shadow_list_lock);

	}

	amdgpu_bo_unref(&bo->parent);



	if (bo->tbo.type != ttm_bo_type_kernel) {

		ubo = to_amdgpu_bo_user(bo);

		kfree(ubo->metadata);

	}



	kvfree(bo);

	amdgpu_bo_destroy(tbo);

}



/**
@@ -91,8 +102,11 @@ static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo) 
 */

bool amdgpu_bo_is_amdgpu_bo(struct ttm_buffer_object *bo)

{

	if (bo->destroy == &amdgpu_bo_destroy)

	if (bo->destroy == &amdgpu_bo_destroy ||

	    bo->destroy == &amdgpu_bo_user_destroy ||

	    bo->destroy == &amdgpu_bo_vm_destroy)

		return true;



	return false;

}
@@ -568,9 +582,12 @@ int amdgpu_bo_create(struct amdgpu_device *adev, 
	if (bp->type == ttm_bo_type_kernel)

		bo->tbo.priority = 1;



	if (!bp->destroy)

		bp->destroy = &amdgpu_bo_destroy;



	r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, bp->type,

				 &bo->placement, page_align, &ctx,  NULL,

				 bp->resv, &amdgpu_bo_destroy);

				 bp->resv, bp->destroy);

	if (unlikely(r != 0))

		return r;
@@ -634,6 +651,7 @@ int amdgpu_bo_create_user(struct amdgpu_device *adev, 
	int r;



	bp->bo_ptr_size = sizeof(struct amdgpu_bo_user);

	bp->destroy = &amdgpu_bo_user_destroy;

	r = amdgpu_bo_create(adev, bp, &bo_ptr);

	if (r)

		return r;
@@ -665,6 +683,7 @@ int amdgpu_bo_create_vm(struct amdgpu_device *adev, 
	 * num of amdgpu_vm_pt entries.

	 */

	BUG_ON(bp->bo_ptr_size < sizeof(struct amdgpu_bo_vm));

	bp->destroy = &amdgpu_bo_vm_destroy;

	r = amdgpu_bo_create(adev, bp, &bo_ptr);

	if (r)

		return r;

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

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ struct amdgpu_bo_param { 
	enum ttm_bo_type		type;

	bool				no_wait_gpu;

	struct dma_resv			*resv;

	void				(*destroy)(struct ttm_buffer_object *bo);

};



/* bo virtual addresses in a vm */