Allow ttm_buffer_object without resource
Subsystems (8)
Hi guys,
this patch set cleans up the handling of TTM buffer objects quite a bit by allowing to create them without allocating a ttm_resource as well.
That's not only cleaner in general, but also a necessary prerequisite for quite a number of related work.
Please review and comment,
Christian.
PATCH 1/11 drm/radeon: switch over to ttm_bo_init_reserved
Use the new interface instead.
--- drivers/gpu/drm/radeon/radeon_object.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
drivers/gpu/drm/radeon/radeon_object.c +11 -6
@@ -133,9 +133,12 @@ int radeon_bo_create(struct radeon_device *rdev,struct dma_resv *resv, struct radeon_bo **bo_ptr) { - struct radeon_bo *bo; -enum ttm_bo_type type; unsigned long page_align = roundup(byte_align, PAGE_SIZE) >> PAGE_SHIFT; + +/* Kernel allocation are uninterruptible */ +struct ttm_operation_ctx ctx = { !kernel, false }; +enum ttm_bo_type type; +struct radeon_bo *bo;int r; size =ALIGN (size,PAGE_SIZE );
@@ -200,11 +203,13 @@ int radeon_bo_create(struct radeon_device *rdev,#endif radeon_ttm_placement_from_domain (bo, domain); -/* Kernel allocation are uninterruptible */ down_read (&rdev->pm.mclk_lock); - r =ttm_bo_init (&rdev->mman.bdev, &bo->tbo, size, type, - &bo->placement, page_align, !kernel, sg, resv, - &radeon_ttm_bo_destroy); + r =ttm_bo_init_reserved (&rdev->mman.bdev, &bo->tbo, size, type, + &bo->placement, page_align, &ctx, sg, resv, + &radeon_ttm_bo_destroy); +if (!r) +ttm_bo_unreserve (&bo->tbo); +up_read (&rdev->pm.mclk_lock);if (unlikely (r !=0 )) {return r;
Signature · 1 line
2.25.1
PATCH 2/11 drm/nouveau: switch over to ttm_bo_init_reserved
In reply to Christian KönigUse the new interface instead.
--- drivers/gpu/drm/nouveau/nouveau_bo.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +7 -3
@@ -302,19 +302,23 @@ nouveau_bo_init(struct nouveau_bo *nvbo, u64 size, int align, u32 domain, struct sg_table *sg, struct dma_resv *robj) { int type = sg ? ttm_bo_type_sg : ttm_bo_type_device; +struct ttm_operation_ctx ctx = { false, false };int ret;nouveau_bo_placement_set (nvbo, domain,0 );INIT_LIST_HEAD (&nvbo->io_reserve_lru); - ret =ttm_bo_init (nvbo->bo.bdev, &nvbo->bo, size, type, - &nvbo->placement, align >>PAGE_SHIFT , false, sg, - robj, nouveau_bo_del_ttm); + ret =ttm_bo_init_reserved (nvbo->bo.bdev, &nvbo->bo, size, type, + &nvbo->placement, align >>PAGE_SHIFT , &ctx, + sg, robj, nouveau_bo_del_ttm);if (ret) {/* ttm will call nouveau_bo_del_ttm if it fails.. */ return ret; } +if (!robj) +ttm_bo_unreserve (&nvbo->bo); +return 0 ; }
Signature · 1 line
2.25.1
PATCH 3/11 drm/vram-helper: switch over to ttm_bo_init_reserved
In reply to Christian KönigUse the new interface instead.
--- drivers/gpu/drm/drm_gem_vram_helper.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_gem_vram_helper.c +6 -4
@@ -186,6 +186,7 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev, size_t size, unsigned long pg_align) { +struct ttm_operation_ctx ctx = { false, false };struct drm_gem_vram_object *gbo;struct drm_gem_object *gem;struct drm_vram_mm *vmm = dev->vram_mm;
@@ -225,12 +226,13 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,* A failing ttm_bo_init will call ttm_buffer_object_destroy * to release gbo->bo.base and kfree gbo. */ - ret =ttm_bo_init (bdev, &gbo->bo, size, ttm_bo_type_device, - &gbo->placement, pg_align, false,NULL ,NULL , - ttm_buffer_object_destroy); -if (ret) + ret =ttm_bo_init_reserved (bdev, &gbo->bo, size, ttm_bo_type_device, + &gbo->placement, pg_align, &ctx,NULL ,NULL , + ttm_buffer_object_destroy); +if (ret)return ERR_PTR (ret); +ttm_bo_unreserve (&gbo->bo);return gbo; }EXPORT_SYMBOL (drm_gem_vram_create);
Signature · 1 line
2.25.1
PATCH 4/11 drm/ttm: move default BO destructor into VMWGFX
In reply to Christian KönigIt's the only driver using this.
--- drivers/gpu/drm/ttm/ttm_bo.c | 9 +-------- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 9 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +1 -8
@@ -44,12 +44,6 @@#include "ttm_module.h" -/* default destructor */ -static void ttm_bo_default_destroy (struct ttm_buffer_object *bo) -{ -kfree (bo); -} -static void ttm_bo_mem_space_debug (struct ttm_buffer_object *bo,struct ttm_placement *placement) {
@@ -938,8 +932,7 @@ int ttm_bo_init_reserved(struct ttm_device *bdev,bool locked;int ret; - bo->destroy = destroy ? destroy : ttm_bo_default_destroy; - + bo->destroy = destroy;kref_init (&bo->kref);INIT_LIST_HEAD (&bo->ddestroy); bo->bdev = bdev;
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c +10 -1
@@ -378,6 +378,12 @@ void vmw_bo_bo_free(struct ttm_buffer_object *bo)kfree (vmw_bo); } +/* default destructor */ +static void vmw_bo_default_destroy (struct ttm_buffer_object *bo) +{ +kfree (bo); +} +/** * vmw_bo_create_kernel - Create a pinned BO for internal kernel use. *
@@ -410,7 +416,7 @@ int vmw_bo_create_kernel(struct vmw_private *dev_priv, unsigned long size, ret =ttm_bo_init_reserved (&dev_priv->bdev, bo, size, ttm_bo_type_kernel, placement,0 , - &ctx,NULL ,NULL ,NULL ); + &ctx,NULL ,NULL , vmw_bo_default_destroy);if (unlikely (ret)) goto error_free;
@@ -439,6 +445,9 @@ int vmw_bo_create(struct vmw_private *vmw,return -ENOMEM ; } +if (!bo_free) + bo_free = vmw_bo_default_destroy; + ret =vmw_bo_init (vmw, *p_bo, size, placement, interruptible, pin, bo_free);
Signature · 1 line
2.25.1
Re: [PATCH 04/11] drm/ttm: move default BO destructor into VMWGFX
Quoted 5 lines · Christian König
⚠ External Email
It's the only driver using this.
Signed-off-by Christian König <[email protected]>
Looks good. A small suggestion underneath.
Quoted 66 lines
---
drivers/gpu/drm/ttm/ttm_bo.c | 9 +--------drivers/gpu/drm/vmwgfx/vmwgfx_bo.c| 11 ++++++++++-2 files changed, 11 insertions(+), 9 deletions(-)drivers/gpu/drm/ttm/ttm_bo.c +0
-6@@ -44,12 +44,6 @@ #include "ttm_module.h" -/* default destructor */ -static void ttm_bo_default_destroy (struct ttm_buffer_object *bo) -{ - kfree(bo); -} - static void ttm_bo_mem_space_debug(struct ttm_buffer_object *bo,struct
ttm_placement*placement)
{drivers/gpu/drm/ttm/ttm_bo.c +1
-2@@ -938,8 +932,7 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, bool locked; int ret; - bo->destroy = destroy ? destroy : ttm_bo_default_destroy; - + bo->destroy = destroy; kref_init(&bo->kref); INIT_LIST_HEAD(&bo->ddestroy); bo->bdev = bdev;drivers/gpu/drm/vmwgfx/vmwgfx_bo.c +6
-0@@ -378,6 +378,12 @@ void vmw_bo_bo_free(struct ttm_buffer_object *bo) kfree(vmw_bo); } +/* default destructor */ +static void vmw_bo_default_destroy (struct ttm_buffer_object *bo) +{ + kfree(bo); +} + /*** vmw_bo_create_kernel - Create a pinned BO for internal kernel use.
*drivers/gpu/drm/vmwgfx/vmwgfx_bo.c +1
-1@@ -410,7 +416,7 @@ int vmw_bo_create_kernel(struct vmw_private *dev_priv, unsigned long size, ret = ttm_bo_init_reserved(&dev_priv->bdev, bo, size, ttm_bo_type_kernel, placement, 0, - &ctx, NULL, NULL, NULL); + &ctx, NULL, NULL, vmw_bo_default_destroy); if (unlikely(ret))goto
error_free;
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c int vmw_bo_create(struct vmw_private *vmw, · line 450
Quoted 6 lines
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c +3
-0@@ -439,6 +445,9 @@ int vmw_bo_create(struct vmw_private *vmw, return -ENOMEM; } + if (!bo_free) + bo_free = vmw_bo_default_destroy; +
If you could change this to just BUG_ON(!bo_free) that'd be great. bo_free == NULL should never happen here.
z
PATCH 5/11 drm/ttm: drop ttm_bo_init
In reply to Christian KönigNot used any more.
--- drivers/gpu/drm/ttm/ttm_bo.c | 26 --------------------- include/drm/ttm/ttm_bo_api.h | 44 ------------------------------------ 2 files changed, 70 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +0 -26
@@ -988,32 +988,6 @@ int ttm_bo_init_reserved(struct ttm_device *bdev, }EXPORT_SYMBOL (ttm_bo_init_reserved); -int ttm_bo_init (struct ttm_device *bdev, -struct ttm_buffer_object *bo, -size_t size, -enum ttm_bo_type type, -struct ttm_placement *placement, -uint32_t page_alignment, -bool interruptible, -struct sg_table *sg, -struct dma_resv *resv, -void (*destroy) (struct ttm_buffer_object *)) -{ -struct ttm_operation_ctx ctx = { interruptible, false }; -int ret; - - ret =ttm_bo_init_reserved (bdev, bo, size, type, placement, - page_alignment, &ctx, sg, resv, destroy); -if (ret) -return ret; - -if (!resv) -ttm_bo_unreserve (bo); - -return 0 ; -} -EXPORT_SYMBOL (ttm_bo_init); -/* * buffer object vm functions. */
include/drm/ttm/ttm_bo_api.h +0 -44
50 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 6/11 drm/ttm: rename and cleanup ttm_bo_init_reserved
In reply to Christian KönigRename ttm_bo_init_reserved to ttm_bo_init_validate since that better matches what the function is actually doing.
Remove the unused size parameter, move the function's kerneldoc to the implementation and cleanup the whole error handling.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- drivers/gpu/drm/drm_gem_vram_helper.c | 2 +- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 5 +- drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- drivers/gpu/drm/qxl/qxl_object.c | 2 +- drivers/gpu/drm/radeon/radeon_object.c | 2 +- drivers/gpu/drm/ttm/ttm_bo.c | 92 ++++++++++++++-------- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 12 ++- include/drm/ttm/ttm_bo_api.h | 44 +---------- 9 files changed, 75 insertions(+), 88 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1 -1
@@ -587,7 +587,7 @@ int amdgpu_bo_create(struct amdgpu_device *adev,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_validate (&adev->mman.bdev, &bo->tbo, bp->type, &bo->placement, page_align, &ctx,NULL , bp->resv, bp->destroy);if (unlikely (r !=0 ))
drivers/gpu/drm/drm_gem_vram_helper.c +1 -1
@@ -226,7 +226,7 @@ struct drm_gem_vram_object *drm_gem_vram_create(struct drm_device *dev,* A failing ttm_bo_init will call ttm_buffer_object_destroy * to release gbo->bo.base and kfree gbo. */ - ret =ttm_bo_init_reserved (bdev, &gbo->bo, size, ttm_bo_type_device, + ret =ttm_bo_init_validate (bdev, &gbo->bo, ttm_bo_type_device, &gbo->placement, pg_align, &ctx,NULL ,NULL , ttm_buffer_object_destroy);if (ret)
drivers/gpu/drm/i915/gem/i915_gem_ttm.c +2 -3
@@ -1075,9 +1075,8 @@ int __i915_gem_ttm_object_init(struct intel_memory_region *mem,* Similarly, in delayed_destroy, we can't call ttm_bo_put() * until successful initialization. */ - ret =ttm_bo_init_reserved (&i915->bdev,i915_gem_to_ttm (obj), size, - bo_type, &i915_sys_placement, - page_size >>PAGE_SHIFT , + ret =ttm_bo_init_validate (&i915->bdev,i915_gem_to_ttm (obj), bo_type, + &i915_sys_placement, page_size >>PAGE_SHIFT , &ctx,NULL ,NULL , i915_ttm_bo_destroy);if (ret)return i915_ttm_err_to_gem (ret);
drivers/gpu/drm/nouveau/nouveau_bo.c +1 -1
@@ -308,7 +308,7 @@ nouveau_bo_init(struct nouveau_bo *nvbo, u64 size, int align, u32 domain,nouveau_bo_placement_set (nvbo, domain,0 );INIT_LIST_HEAD (&nvbo->io_reserve_lru); - ret =ttm_bo_init_reserved (nvbo->bo.bdev, &nvbo->bo, size, type, + ret =ttm_bo_init_validate (nvbo->bo.bdev, &nvbo->bo, type, &nvbo->placement, align >>PAGE_SHIFT , &ctx, sg, robj, nouveau_bo_del_ttm);if (ret) {
drivers/gpu/drm/qxl/qxl_object.c +1 -1
@@ -141,7 +141,7 @@ int qxl_bo_create(struct qxl_device *qdev, unsigned long size,qxl_ttm_placement_from_domain (bo, domain); bo->tbo.priority = priority; - r =ttm_bo_init_reserved (&qdev->mman.bdev, &bo->tbo, size, type, + r =ttm_bo_init_validate (&qdev->mman.bdev, &bo->tbo, type, &bo->placement,0 , &ctx,NULL ,NULL , &qxl_ttm_bo_destroy);if (unlikely (r !=0 )) {
drivers/gpu/drm/radeon/radeon_object.c +1 -1
@@ -204,7 +204,7 @@ int radeon_bo_create(struct radeon_device *rdev,radeon_ttm_placement_from_domain (bo, domain);down_read (&rdev->pm.mclk_lock); - r =ttm_bo_init_reserved (&rdev->mman.bdev, &bo->tbo, size, type, + r =ttm_bo_init_validate (&rdev->mman.bdev, &bo->tbo, type, &bo->placement, page_align, &ctx, sg, resv, &radeon_ttm_bo_destroy);if (!r)
drivers/gpu/drm/ttm/ttm_bo.c +60 -32
130 lines not on this page · raw message
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c +5 -7
@@ -414,9 +414,9 @@ int vmw_bo_create_kernel(struct vmw_private *dev_priv, unsigned long size,drm_gem_private_object_init (vdev, &bo->base, size); - ret =ttm_bo_init_reserved (&dev_priv->bdev, bo, size, - ttm_bo_type_kernel, placement,0 , - &ctx,NULL ,NULL , vmw_bo_default_destroy); + ret =ttm_bo_init_validate (&dev_priv->bdev, bo, ttm_bo_type_kernel, + placement,0 , &ctx,NULL ,NULL , + vmw_bo_default_destroy);if (unlikely (ret)) goto error_free;
@@ -498,10 +498,8 @@ int vmw_bo_init(struct vmw_private *dev_priv, size =ALIGN (size,PAGE_SIZE );drm_gem_private_object_init (vdev, &vmw_bo->base.base, size); - ret =ttm_bo_init_reserved (bdev, &vmw_bo->base, size, - ttm_bo_type_device, - placement, -0 , &ctx,NULL ,NULL , bo_free); + ret =ttm_bo_init_validate (bdev, &vmw_bo->base, ttm_bo_type_device, + placement,0 , &ctx,NULL ,NULL , bo_free);if (unlikely (ret)) {return ret; }
include/drm/ttm/ttm_bo_api.h +3 -41
50 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH 7/11 drm/amdgpu: audit bo->resource usage
In reply to Christian KönigMake sure we can at least move and release BOs without backing store.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +1 -1
@@ -1299,7 +1299,7 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo)if (bo->base.resv == &bo->base._resv)amdgpu_amdkfd_remove_fence_on_pt_pd_bos (abo); -if (bo->resource->mem_type !=TTM_PL_VRAM || +if (!bo->resource || bo->resource->mem_type !=TTM_PL_VRAM || !(abo->flags &AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE ))return ;
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -1
@@ -476,7 +476,8 @@ static int amdgpu_bo_move(struct ttm_buffer_object *bo, bool evict, adev =amdgpu_ttm_adev (bo->bdev); -if (old_mem->mem_type ==TTM_PL_SYSTEM && bo->ttm ==NULL ) { +if (!old_mem || (old_mem->mem_type ==TTM_PL_SYSTEM && + bo->ttm ==NULL )) {ttm_bo_move_null (bo, new_mem); goto out; }
Signature · 1 line
2.25.1
PATCH 8/11 drm/nouveau: audit bo->resource usage
In reply to Christian KönigMake sure we can at least move and release BOs without backing store.
--- drivers/gpu/drm/nouveau/nouveau_bo.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_bo.c +2 -1
@@ -1003,7 +1003,8 @@ nouveau_bo_move(struct ttm_buffer_object *bo, bool evict, }/* Fake bo copy. */ -if (old_reg->mem_type ==TTM_PL_SYSTEM && !bo->ttm) { +if (!old_reg || (old_reg->mem_type ==TTM_PL_SYSTEM && + !bo->ttm)) {ttm_bo_move_null (bo, new_reg); goto out; }
Signature · 1 line
2.25.1
PATCH 9/11 drm/ttm: audit bo->resource usage
In reply to Christian KönigAllow BOs to exist without backing store.
--- drivers/gpu/drm/ttm/ttm_bo.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +8 -8
@@ -117,12 +117,13 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,struct ttm_operation_ctx *ctx, struct ttm_place *hop) { - struct ttm_resource_manager *old_man, *new_man; struct ttm_device *bdev = bo->bdev; +bool old_use_tt, new_use_tt;int ret; - old_man =ttm_manager_type (bdev, bo->resource->mem_type); - new_man =ttm_manager_type (bdev, mem->mem_type); + old_use_tt = bo->resource && +ttm_manager_type (bdev, bo->resource->mem_type)->use_tt; + new_use_tt =ttm_manager_type (bdev, mem->mem_type)->use_tt;ttm_bo_unmap_virtual (bo);
@@ -130,11 +131,11 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,* Create and bind a ttm if required. */ -if (new_man->use_tt) { +if (new_use_tt) {/* Zero init the new TTM structure if the old location should * have used one as well. */ - ret =ttm_tt_create (bo, old_man->use_tt); + ret =ttm_tt_create (bo, old_use_tt);if (ret) goto out_err;
@@ -156,8 +157,7 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo,return 0 ; out_err: - new_man =ttm_manager_type (bdev, bo->resource->mem_type); -if (!new_man->use_tt) +if (!old_use_tt)ttm_bo_tt_destroy (bo);return ret;
@@ -900,7 +900,7 @@ int ttm_bo_validate(struct ttm_buffer_object *bo,/* * Check whether we need to move buffer. */ -if (!ttm_resource_compat (bo->resource, placement)) { +if (!bo->resource || !ttm_resource_compat (bo->resource, placement)) { ret =ttm_bo_move_buffer (bo, placement, ctx);if (ret)return ret;
Signature · 1 line
2.25.1
PATCH 10/11 drm/ttm: stop allocating dummy resources during BO creation
In reply to Christian KönigThat should not be necessary any more when drivers should at least be able to handle the move without a resource.
--- drivers/gpu/drm/ttm/ttm_bo.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +0 -7
@@ -956,7 +956,6 @@ int ttm_bo_init_validate(struct ttm_device *bdev, struct ttm_buffer_object *bo, struct sg_table *sg, struct dma_resv *resv, void (*destroy) (struct ttm_buffer_object *)) { - static const struct ttm_place sys_mem = { .mem_type = TTM_PL_SYSTEM }; int ret;kref_init (&bo->kref);
@@ -975,12 +974,6 @@ int ttm_bo_init_validate(struct ttm_device *bdev, struct ttm_buffer_object *bo, bo->base.resv = &bo->base._resv;atomic_inc (&ttm_glob.bo_count); - ret =ttm_resource_alloc (bo, &sys_mem, &bo->resource); -if (unlikely (ret)) { -ttm_bo_put (bo); -return ret; - } -/* * For ttm_bo_type_device buffers, allocate * address space from the device.
Signature · 1 line
2.25.1
PATCH 11/11 drm/ttm: stop allocating a dummy resource for pipelined gutting
In reply to Christian KönigThat should not be necessary any more when drivers should at least be able to handle a move without a resource.
--- drivers/gpu/drm/ttm/ttm_bo_util.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
drivers/gpu/drm/ttm/ttm_bo_util.c +2 -13
@@ -585,16 +585,10 @@ EXPORT_SYMBOL(ttm_bo_move_accel_cleanup);*/ int ttm_bo_pipeline_gutting (struct ttm_buffer_object *bo) { -static const struct ttm_place sys_mem = { .mem_type =TTM_PL_SYSTEM };struct ttm_buffer_object *ghost; -struct ttm_resource *sys_res;struct ttm_tt *ttm;int ret; - ret =ttm_resource_alloc (bo, &sys_mem, &sys_res); -if (ret) -return ret; -/* If already idle, no need for ghost object dance. */ ret =ttm_bo_wait (bo, false, true);if (ret != -EBUSY ) {
@@ -602,14 +596,13 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)/* See comment below about clearing. */ ret =ttm_tt_create (bo, true);if (ret) - goto error_free_sys_mem; +return ret; }else {ttm_tt_unpopulate (bo->bdev, bo->ttm);if (bo->type == ttm_bo_type_device)ttm_tt_mark_for_clear (bo->ttm); }ttm_resource_free (bo, &bo->resource); -ttm_bo_assign_mem (bo, sys_res);return 0 ; }
@@ -626,7 +619,7 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo) ret =ttm_tt_create (bo, true);swap (bo->ttm, ttm);if (ret) - goto error_free_sys_mem; +return ret; ret =ttm_buffer_object_transfer (bo, &ghost);if (ret)
@@ -640,13 +633,9 @@ int ttm_bo_pipeline_gutting(struct ttm_buffer_object *bo)dma_resv_unlock (&ghost->base._resv);ttm_bo_put (ghost); bo->ttm = ttm; -ttm_bo_assign_mem (bo, sys_res);return 0 ; error_destroy_tt:ttm_tt_destroy (bo->bdev, ttm); - -error_free_sys_mem: -ttm_resource_free (bo, &sys_res);return ret; }
Signature · 1 line
2.25.1
Quoted 7 lines · Christian König
Hi guys,
this patch set cleans up the handling of TTM buffer objects quite a bit by allowing to create them without allocating a
ttm_resourceas well.That's not only cleaner in general, but also a necessary prerequisite for quite a number of related work.
Maybe there's some threads I missed, but I can't really guess what this could be useful for without even a hint.
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Am 29.03.22 um 16:02 schrieb Daniel Vetter:
Quoted 10 lines · Christian König
Quoted 7 lines
Hi guys,
this patch set cleans up the handling of TTM buffer objects quite a bit by allowing to create them without allocating a
ttm_resourceas well.That's not only cleaner in general, but also a necessary prerequisite for quite a number of related work.
Maybe there's some threads I missed, but I can't really guess what this could be useful for without even a hint.
Well about a week ago Bob send me a partial implementation of this and said he needs it for i915. What exactly i915 needs here I'm not sure about either.
I have this cleanup in the pipeline because amdgpu wants to improve his page table handling with this and independent of those driver use case patches #10 and #11 drop allocating dummy resources for two use cases in TTM.
Christian.
Quoted 1 line
-Daniel