drm/amdgpu: parameterize ttm BO destroy callback
Subsystems (2)
PATCH v2 1/2 drm/amdgpu: parameterize ttm BO destroy callback
Make provision to pass different ttm BO destroy callback while creating a amdgpu_bo.
v2: pass destroy callback using amdgpu_bo_param.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 52 +++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 +- 2 files changed, 42 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +40 -12
@@ -12,7 +12,7 @@* * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +* FITNEsS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
@@ -73,11 +73,9 @@ static void amdgpu_bo_subtract_pin_size(struct amdgpu_bo *bo) } } -static void amdgpu_bo_destroy (struct ttm_buffer_object *tbo) +static void amdgpu_bo_destroy_base (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;if (bo->tbo.pin_count >0 )amdgpu_bo_subtract_pin_size (bo);
@@ -87,18 +85,40 @@ static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo)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); +} + +static void amdgpu_bo_destroy (struct ttm_buffer_object *tbo) +{ +struct amdgpu_bo *bo =ttm_to_amdgpu_bo (tbo); + +amdgpu_bo_destroy_base (tbo); +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; + +amdgpu_bo_destroy_base (tbo); + ubo =to_amdgpu_bo_user (bo); +kfree (ubo->metadata); +kvfree (bo); +} + +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); + +amdgpu_bo_destroy_base (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); }
@@ -115,8 +135,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; }
@@ -592,9 +615,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;
@@ -658,6 +684,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;
@@ -689,6 +716,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
@@ -55,7 +55,8 @@ struct amdgpu_bo_param {u64 flags;enum ttm_bo_type type;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 */
--
2.31.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amdgpu: move shadow_list to amdgpu_bo_vm
Move shadow_list to struct amdgpu_bo_vm as shadow BOs are part of PT/PD BOs.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 13 +++++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 6 ++---- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -2
@@ -4063,6 +4063,7 @@ static int amdgpu_device_recover_vram(struct amdgpu_device *adev) {struct dma_fence *fence =NULL , *next =NULL ;struct amdgpu_bo *shadow; +struct amdgpu_bo_vm *vmbo;long r =1 , tmo;if (amdgpu_sriov_runtime (adev))
@@ -4072,8 +4073,8 @@ static int amdgpu_device_recover_vram(struct amdgpu_device *adev)dev_info (adev->dev,"recover vram bo from shadow start\n" );mutex_lock (&adev->shadow_list_lock); -list_for_each_entry (shadow, &adev->shadow_list, shadow_list) { - +list_for_each_entry (vmbo, &adev->shadow_list, shadow_list) { + shadow = &vmbo->bo;/* No need to recover an evicted BO */ if (shadow->tbo.mem.mem_type != TTM_PL_TT || shadow->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET ||
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +7 -6
@@ -111,12 +111,13 @@ 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); +struct amdgpu_bo_vm *vmbo =to_amdgpu_bo_vm (bo);amdgpu_bo_destroy_base (tbo);/* in case amdgpu_device_recover_vram got NULL of bo->parent */ -if (!list_empty (&bo->shadow_list)) { +if (!list_empty (&vmbo->shadow_list)) {mutex_lock (&adev->shadow_list_lock); -list_del_init (&bo->shadow_list); +list_del_init (&vmbo->shadow_list);mutex_unlock (&adev->shadow_list_lock); }
@@ -592,7 +593,6 @@ int amdgpu_bo_create(struct amdgpu_device *adev,if (bo ==NULL )return -ENOMEM ;drm_gem_private_object_init (adev_to_drm (adev), &bo->tbo.base, size); -INIT_LIST_HEAD (&bo->shadow_list); bo->vm_bo =NULL ; bo->preferred_domains = bp->preferred_domain ? bp->preferred_domain : bp->domain;
@@ -722,6 +722,7 @@ int amdgpu_bo_create_vm(struct amdgpu_device *adev,return r; *vmbo_ptr =to_amdgpu_bo_vm (bo_ptr); +INIT_LIST_HEAD (&(*vmbo_ptr)->shadow_list);return r; }
@@ -766,12 +767,12 @@ int amdgpu_bo_validate(struct amdgpu_bo *bo)* * Insert a BO to the shadow list. */ -void amdgpu_bo_add_to_shadow_list (struct amdgpu_bo *bo) +void amdgpu_bo_add_to_shadow_list (struct amdgpu_bo_vm *vmbo) { -struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev); +struct amdgpu_device *adev =amdgpu_ttm_adev (vmbo->bo.tbo.bdev);mutex_lock (&adev->shadow_list_lock); -list_add_tail (&bo->shadow_list, &adev->shadow_list); +list_add_tail (&vmbo->shadow_list, &adev->shadow_list);mutex_unlock (&adev->shadow_list_lock); }
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +2 -4
@@ -109,9 +109,6 @@ struct amdgpu_bo {#ifdef CONFIG_MMU_NOTIFIER struct mmu_interval_notifier notifier;#endif - -struct list_head shadow_list; -struct kgd_mem *kfd_bo; };
@@ -127,6 +124,7 @@ struct amdgpu_bo_user {struct amdgpu_bo_vm {struct amdgpu_bo bo;struct amdgpu_bo *shadow; +struct list_head shadow_list;struct amdgpu_vm_bo_base entries[]; };
@@ -333,7 +331,7 @@ u64 amdgpu_bo_gpu_offset_no_check(struct amdgpu_bo *bo);int amdgpu_bo_validate (struct amdgpu_bo *bo);void amdgpu_bo_get_memory (struct amdgpu_bo *bo,uint64_t *vram_mem,uint64_t *gtt_mem,uint64_t *cpu_mem); -void amdgpu_bo_add_to_shadow_list (struct amdgpu_bo *bo); +void amdgpu_bo_add_to_shadow_list (struct amdgpu_bo_vm *vmbo);int amdgpu_bo_restore_shadow (struct amdgpu_bo *shadow,struct dma_fence **fence); uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1 -1
@@ -936,7 +936,7 @@ static int amdgpu_vm_pt_create(struct amdgpu_device *adev, } (*vmbo)->shadow->parent =amdgpu_bo_ref (bo); -amdgpu_bo_add_to_shadow_list ((*vmbo)->shadow); +amdgpu_bo_add_to_shadow_list ((*vmbo));return 0 ; }
Signature · 6 lines
2.31.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
maintainerRe: [PATCH 2/2] drm/amdgpu: move shadow_list to amdgpu_bo_vm
Am 14.06.21 um 21:26 schrieb Nirmoy Das:
Quoted 101 lines
Move
shadow_listto structamdgpu_bo_vmas shadow BOs are part of PT/PD BOs.Signed-off-by Nirmoy Das <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 +++-- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 13 +++++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 6 ++---- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3
-2@@ -4063,6 +4063,7 @@ static int amdgpu_device_recover_vram(struct amdgpu_device *adev) {struct dma_fence *fence =NULL , *next =NULL ;struct amdgpu_bo *shadow; +struct amdgpu_bo_vm *vmbo;long r =1 , tmo;if (amdgpu_sriov_runtime (adev))@@ -4072,8 +4073,8 @@ static int amdgpu_device_recover_vram(struct amdgpu_device *adev)dev_info (adev->dev,"recover vram bo from shadow start\n" );mutex_lock (&adev->shadow_list_lock); -list_for_each_entry (shadow, &adev->shadow_list, shadow_list) { - +list_for_each_entry (vmbo, &adev->shadow_list, shadow_list) { + shadow = &vmbo->bo;/* No need to recover an evicted BO */ if (shadow->tbo.mem.mem_type != TTM_PL_TT || shadow->tbo.mem.start == AMDGPU_BO_INVALID_OFFSET ||drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +7
-6@@ -111,12 +111,13 @@ 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); +struct amdgpu_bo_vm *vmbo =to_amdgpu_bo_vm (bo);amdgpu_bo_destroy_base (tbo);/* in case amdgpu_device_recover_vram got NULL of bo->parent */ -if (!list_empty (&bo->shadow_list)) { +if (!list_empty (&vmbo->shadow_list)) {mutex_lock (&adev->shadow_list_lock); -list_del_init (&bo->shadow_list); +list_del_init (&vmbo->shadow_list);mutex_unlock (&adev->shadow_list_lock); }@@ -592,7 +593,6 @@ int amdgpu_bo_create(struct amdgpu_device *adev,if (bo ==NULL )return -ENOMEM ;drm_gem_private_object_init (adev_to_drm (adev), &bo->tbo.base, size); -INIT_LIST_HEAD (&bo->shadow_list); bo->vm_bo =NULL ; bo->preferred_domains = bp->preferred_domain ? bp->preferred_domain : bp->domain;@@ -722,6 +722,7 @@ int amdgpu_bo_create_vm(struct amdgpu_device *adev,return r; *vmbo_ptr =to_amdgpu_bo_vm (bo_ptr); +INIT_LIST_HEAD (&(*vmbo_ptr)->shadow_list);return r; }@@ -766,12 +767,12 @@ int amdgpu_bo_validate(struct amdgpu_bo *bo)* * Insert a BO to the shadow list. */ -void amdgpu_bo_add_to_shadow_list (struct amdgpu_bo *bo) +void amdgpu_bo_add_to_shadow_list (struct amdgpu_bo_vm *vmbo) { -struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev); +struct amdgpu_device *adev =amdgpu_ttm_adev (vmbo->bo.tbo.bdev);mutex_lock (&adev->shadow_list_lock); -list_add_tail (&bo->shadow_list, &adev->shadow_list); +list_add_tail (&vmbo->shadow_list, &adev->shadow_list);mutex_unlock (&adev->shadow_list_lock); }drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +0
-3@@ -109,9 +109,6 @@ struct amdgpu_bo {#ifdef CONFIG_MMU_NOTIFIER struct mmu_interval_notifier notifier;#endif - -struct list_head shadow_list; -struct kgd_mem *kfd_bo; };
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h struct amdgpu_bo_user { · line 127
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +1
-0@@ -127,6 +124,7 @@ struct amdgpu_bo_user {struct amdgpu_bo_vm {struct amdgpu_bo bo;struct amdgpu_bo *shadow; +struct list_head shadow_list;
We would actually need an amdgpu_bo_shadow for this, but not in this patch probably.
Christian.
Quoted 17 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +1
-1struct amdgpu_vm_bo_base entries[]; };@@ -333,7 +331,7 @@ u64 amdgpu_bo_gpu_offset_no_check(struct amdgpu_bo *bo);int amdgpu_bo_validate (struct amdgpu_bo *bo);void amdgpu_bo_get_memory (struct amdgpu_bo *bo,uint64_t *vram_mem,uint64_t *gtt_mem,uint64_t *cpu_mem); -void amdgpu_bo_add_to_shadow_list (struct amdgpu_bo *bo); +void amdgpu_bo_add_to_shadow_list (struct amdgpu_bo_vm *vmbo);int amdgpu_bo_restore_shadow (struct amdgpu_bo *shadow,struct dma_fence **fence); uint32_t amdgpu_bo_get_preferred_pin_domain(struct amdgpu_device *adev,drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c static int amdgpu_vm_pt_create(struct amdgpu_device *adev, · line 942
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +1
-1@@ -936,7 +936,7 @@ static int amdgpu_vm_pt_create(struct amdgpu_device *adev, } (*vmbo)->shadow->parent =amdgpu_bo_ref (bo); -amdgpu_bo_add_to_shadow_list ((*vmbo)->shadow); +amdgpu_bo_add_to_shadow_list ((*vmbo));return 0 ; }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 17 lines · Nirmoy Das
Make provision to pass different ttm BO destroy callback while creating a
amdgpu_bo.v2: pass destroy callback using
amdgpu_bo_param.Signed-off-by Nirmoy Das <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 52 +++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 +- 2 files changed, 42 insertions(+), 13 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c line 18
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1
-1@@ -12,7 +12,7 @@* * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +* FITNEsS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
Unrelated whitespace change. Please drop.
Alex
Quoted 120 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +39
-11@@ -73,11 +73,9 @@ static void amdgpu_bo_subtract_pin_size(struct amdgpu_bo *bo) } } -static void amdgpu_bo_destroy (struct ttm_buffer_object *tbo) +static void amdgpu_bo_destroy_base (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;if (bo->tbo.pin_count >0 )amdgpu_bo_subtract_pin_size (bo);@@ -87,18 +85,40 @@ static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo)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); +} + +static void amdgpu_bo_destroy (struct ttm_buffer_object *tbo) +{ +struct amdgpu_bo *bo =ttm_to_amdgpu_bo (tbo); + +amdgpu_bo_destroy_base (tbo); +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; + +amdgpu_bo_destroy_base (tbo); + ubo =to_amdgpu_bo_user (bo); +kfree (ubo->metadata); +kvfree (bo); +} + +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); + +amdgpu_bo_destroy_base (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); }@@ -115,8 +135,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; }@@ -592,9 +615,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;@@ -658,6 +684,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;@@ -689,6 +716,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
-2@@ -55,7 +55,8 @@ struct amdgpu_bo_param {u64 flags;enum ttm_bo_type type;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 */ --2.31.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 12 lines · Alex Deucher
Quoted 11 lines · Nirmoy Das
Make provision to pass different ttm BO destroy callback while creating a
amdgpu_bo.v2: pass destroy callback using
amdgpu_bo_param.Signed-off-by Nirmoy Das <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 52 +++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 +- 2 files changed, 42 insertions(+), 13 deletions(-)
Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c line 18
Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1
-1@@ -12,7 +12,7 @@* * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +* FITNEsS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE Unrelated whitespace change. Please drop.
Thanks Alex. I will remove it in time.
Quoted 119 lines
Alex
Quoted 116 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +39
-11@@ -73,11 +73,9 @@ static void amdgpu_bo_subtract_pin_size(struct amdgpu_bo *bo) } } -static void amdgpu_bo_destroy (struct ttm_buffer_object *tbo) +static void amdgpu_bo_destroy_base (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;if (bo->tbo.pin_count >0 )amdgpu_bo_subtract_pin_size (bo);@@ -87,18 +85,40 @@ static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo)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); +} + +static void amdgpu_bo_destroy (struct ttm_buffer_object *tbo) +{ +struct amdgpu_bo *bo =ttm_to_amdgpu_bo (tbo); + +amdgpu_bo_destroy_base (tbo); +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; + +amdgpu_bo_destroy_base (tbo); + ubo =to_amdgpu_bo_user (bo); +kfree (ubo->metadata); +kvfree (bo); +} + +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); + +amdgpu_bo_destroy_base (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); }@@ -115,8 +135,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; }@@ -592,9 +615,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;@@ -658,6 +684,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;@@ -689,6 +716,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@@ -55,7 +55,8 @@ struct amdgpu_bo_param {u64 flags;enum ttm_bo_type type;bool no_wait_gpu; -struct dma_resv *resv; +struct dma_resv *resv; +void (*destroy)(struct ttm_buffer_object *bo); };
Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +0
-1/* bo virtual addresses in a vm */ --2.31.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cnirmoy.das%40amd.com%7C759d1f627e9f4253baa508d92f6f24bb%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637592976669056718%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=74RcdxNGmdFbtidZgHVcYPKR3Nycx4TKNQqfS9%2B6IgI%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Christian König
maintainerAm 14.06.21 um 21:26 schrieb Nirmoy Das:
Quoted 51 lines
Make provision to pass different ttm BO destroy callback while creating a
amdgpu_bo.v2: pass destroy callback using
amdgpu_bo_param.Signed-off-by Nirmoy Das <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 52 +++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 3 +- 2 files changed, 42 insertions(+), 13 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +12
-4@@ -12,7 +12,7 @@* * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL +* FITNEsS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE @@ -73,11 +73,9 @@ static void amdgpu_bo_subtract_pin_size(struct amdgpu_bo *bo) } } -static void amdgpu_bo_destroy (struct ttm_buffer_object *tbo) +static void amdgpu_bo_destroy_base (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;if (bo->tbo.pin_count >0 )amdgpu_bo_subtract_pin_size (bo);@@ -87,18 +85,40 @@ static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo)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); +} + +static void amdgpu_bo_destroy (struct ttm_buffer_object *tbo) +{ +struct amdgpu_bo *bo =ttm_to_amdgpu_bo (tbo); + +amdgpu_bo_destroy_base (tbo); +kvfree (bo); +}
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo) · line 107
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +10
-0+ +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; + +amdgpu_bo_destroy_base (tbo); + ubo =to_amdgpu_bo_user (bo); +kfree (ubo->metadata); +kvfree (bo);
Why not freeing the metadata first and having the kvfree() in amdgpu_bo_destroy()?
Apart from that looks good to me.
Christian.
Quoted 81 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +18
-8+} + +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); + +amdgpu_bo_destroy_base (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); }@@ -115,8 +135,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; }@@ -592,9 +615,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;@@ -658,6 +684,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;@@ -689,6 +716,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
-2@@ -55,7 +55,8 @@ struct amdgpu_bo_param {u64 flags;enum ttm_bo_type type;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 */ --
Quoted 2 lines
2.31.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 60 lines · Christian König
Am 14.06.21 um 21:26 schrieb Nirmoy Das:
Quoted 59 lines
Make provision to pass different ttm BO destroy callback while creating a
amdgpu_bo.v2: pass destroy callback using
amdgpu_bo_param.Signed-off-by Nirmoy Das <[email protected]>---
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c| 52 +++++++++++++++++-----drivers/gpu/drm/amd/amdgpu/amdgpu_object.h| 3 +-2 files changed, 42 insertions(+), 13 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +0
-1@@ -12,7 +12,7 @@ * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NOEVENT SHALL
+ * FITNEsS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THEdrivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1
-3@@ -73,11 +73,9 @@ static void amdgpu_bo_subtract_pin_size(struct amdgpu_bo *bo) } } -static void amdgpu_bo_destroy (struct ttm_buffer_object *tbo) +static void amdgpu_bo_destroy_base (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; if (bo->tbo.pin_count > 0)
amdgpu_bo_subtract_pin_size(bo);drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +14
-0@@ -87,18 +85,40 @@ static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo) 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); +} + +static void amdgpu_bo_destroy (struct ttm_buffer_object *tbo) +{ + struct amdgpu_bo *bo = ttm_to_amdgpu_bo(tbo); + + amdgpu_bo_destroy_base(tbo); + kvfree(bo); +} + +static void amdgpu_bo_user_destroy (struct ttm_buffer_object *tbo) +{ + struct amdgpu_bo *bo = ttm_to_amdgpu_bo(tbo);
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c static void amdgpu_bo_destroy(struct ttm_buffer_object *tbo) · line 107
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +6
-0+ struct amdgpu_bo_user *ubo; + + amdgpu_bo_destroy_base(tbo); + ubo = to_amdgpu_bo_user(bo); + kfree(ubo->metadata); + kvfree(bo);Why not freeing the metadata first and having the
kvfree()inamdgpu_bo_destroy()?
Didn't think about that, it would be me much cleaner.
Thanks,
Nirmoy
Quoted 86 lines
Apart from that looks good to me.
Christian.
Quoted 81 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +8
-6+} + +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); + + amdgpu_bo_destroy_base(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);}
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +9
-2@@ -115,8 +135,11 @@ static void amdgpu_bo_destroy(structttm_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; }@@ -592,9 +615,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;@@ -658,6 +684,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;
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1
-0@@ -689,6 +716,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@@ -55,7 +55,8 @@ struct amdgpu_bo_param { u64 flags; enum ttm_bo_type type; bool no_wait_gpu; - struct dma_resv *resv; + struct dma_resv *resv; + void (*destroy)(struct ttm_buffer_object *bo); };
Quoted 5 lines
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +0
-0/* bo virtual addresses in a vm */Signature · 1 line
2.31.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx