iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu: parameterize ttm BO destroy callback

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

Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Nirmoy Das 2021-06-14 19:49:50 +02:00 committed by Alex Deucher
parent 391629bdfc
commit 23e24fbb76
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
View File

@ -54,29 +54,40 @@
static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo) 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 *bo = ttm_to_amdgpu_bo(tbo);
struct amdgpu_bo_user *ubo;
amdgpu_bo_kunmap(bo); amdgpu_bo_kunmap(bo);
if (bo->tbo.base.import_attach) if (bo->tbo.base.import_attach)
drm_prime_gem_destroy(&bo->tbo.base, bo->tbo.sg); drm_prime_gem_destroy(&bo->tbo.base, bo->tbo.sg);
drm_gem_object_release(&bo->tbo.base); 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 */ /* in case amdgpu_device_recover_vram got NULL of bo->parent */
if (!list_empty(&bo->shadow_list)) { if (!list_empty(&bo->shadow_list)) {
mutex_lock(&adev->shadow_list_lock); mutex_lock(&adev->shadow_list_lock);
list_del_init(&bo->shadow_list); list_del_init(&bo->shadow_list);
mutex_unlock(&adev->shadow_list_lock); mutex_unlock(&adev->shadow_list_lock);
} }
amdgpu_bo_unref(&bo->parent);
if (bo->tbo.type != ttm_bo_type_kernel) { amdgpu_bo_destroy(tbo);
ubo = to_amdgpu_bo_user(bo);
kfree(ubo->metadata);
}
kvfree(bo);
} }
/** /**
@ -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) 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 true;
return false; return false;
} }
@ -568,9 +582,12 @@ int amdgpu_bo_create(struct amdgpu_device *adev,
if (bp->type == ttm_bo_type_kernel) if (bp->type == ttm_bo_type_kernel)
bo->tbo.priority = 1; 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, r = ttm_bo_init_reserved(&adev->mman.bdev, &bo->tbo, size, bp->type,
&bo->placement, page_align, &ctx, NULL, &bo->placement, page_align, &ctx, NULL,
bp->resv, &amdgpu_bo_destroy); bp->resv, bp->destroy);
if (unlikely(r != 0)) if (unlikely(r != 0))
return r; return r;
@ -634,6 +651,7 @@ int amdgpu_bo_create_user(struct amdgpu_device *adev,
int r; int r;
bp->bo_ptr_size = sizeof(struct amdgpu_bo_user); bp->bo_ptr_size = sizeof(struct amdgpu_bo_user);
bp->destroy = &amdgpu_bo_user_destroy;
r = amdgpu_bo_create(adev, bp, &bo_ptr); r = amdgpu_bo_create(adev, bp, &bo_ptr);
if (r) if (r)
return r; return r;
@ -665,6 +683,7 @@ int amdgpu_bo_create_vm(struct amdgpu_device *adev,
* num of amdgpu_vm_pt entries. * num of amdgpu_vm_pt entries.
*/ */
BUG_ON(bp->bo_ptr_size < sizeof(struct amdgpu_bo_vm)); 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); r = amdgpu_bo_create(adev, bp, &bo_ptr);
if (r) if (r)
return r; return r;

3
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h
View File

@ -55,7 +55,8 @@ struct amdgpu_bo_param {
u64 flags; u64 flags;
enum ttm_bo_type type; enum ttm_bo_type type;
bool no_wait_gpu; bool no_wait_gpu;
struct dma_resv *resv; struct dma_resv *resv;
void (*destroy)(struct ttm_buffer_object *bo);
}; };
/* bo virtual addresses in a vm */ /* bo virtual addresses in a vm */