Commit ed7a4397 authored by Christian König's avatar Christian König
Browse files

drm/ttm: rename ttm_bo_put to _fini v3 



Give TTM BOs a separate cleanup function.

No funktional change, but the next step in removing the TTM BO reference
counting and replacing it with the GEM object reference counting.

v2: move the code around a bit to make it clearer what's happening
v3: fix nouveau_bo_fini as well

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Acked-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://lore.kernel.org/r/20250909144311.1927-1-christian.koenig@amd.com
parent 940dd88c

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

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ static void amdgpu_gem_object_free(struct drm_gem_object *gobj) 
	struct amdgpu_bo *aobj = gem_to_amdgpu_bo(gobj);



	amdgpu_hmm_unregister(aobj);

	ttm_bo_put(&aobj->tbo);

	ttm_bo_fini(&aobj->tbo);

}



int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size,

drivers/gpu/drm/drm_gem_vram_helper.c

+3 −3
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static const struct drm_gem_object_funcs drm_gem_vram_object_funcs; 


static void drm_gem_vram_cleanup(struct drm_gem_vram_object *gbo)

{

	/* We got here via ttm_bo_put(), which means that the

	/* We got here via ttm_bo_fini(), which means that the

	 * TTM buffer object in 'bo' has already been cleaned

	 * up; only release the GEM object.

	 */
@@ -234,11 +234,11 @@ EXPORT_SYMBOL(drm_gem_vram_create); 
 * drm_gem_vram_put() - Releases a reference to a VRAM-backed GEM object

 * @gbo:	the GEM VRAM object

 *

 * See ttm_bo_put() for more information.

 * See ttm_bo_fini() for more information.

 */

void drm_gem_vram_put(struct drm_gem_vram_object *gbo)

{

	ttm_bo_put(&gbo->bo);

	ttm_bo_fini(&gbo->bo);

}

EXPORT_SYMBOL(drm_gem_vram_put);

drivers/gpu/drm/i915/gem/i915_gem_ttm.c

+2 −2
Original line number Diff line number Diff line
@@ -1029,7 +1029,7 @@ static void i915_ttm_delayed_free(struct drm_i915_gem_object *obj) 
{

	GEM_BUG_ON(!obj->ttm.created);



	ttm_bo_put(i915_gem_to_ttm(obj));

	ttm_bo_fini(i915_gem_to_ttm(obj));

}



static vm_fault_t vm_fault_ttm(struct vm_fault *vmf)
@@ -1325,7 +1325,7 @@ int __i915_gem_ttm_object_init(struct intel_memory_region *mem, 
	 * If this function fails, it will call the destructor, but

	 * our caller still owns the object. So no freeing in the

	 * destructor until obj->ttm.created is true.

	 * Similarly, in delayed_destroy, we can't call ttm_bo_put()

	 * Similarly, in delayed_destroy, we can't call ttm_bo_fini()

	 * until successful initialization.

	 */

	ret = ttm_bo_init_reserved(&i915->bdev, i915_gem_to_ttm(obj), bo_type,

drivers/gpu/drm/loongson/lsdc_gem.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void lsdc_gem_object_free(struct drm_gem_object *obj) 
	struct ttm_buffer_object *tbo = to_ttm_bo(obj);



	if (tbo)

		ttm_bo_put(tbo);

		ttm_bo_fini(tbo);

}



static int lsdc_gem_object_vmap(struct drm_gem_object *obj, struct iosys_map *map)

drivers/gpu/drm/nouveau/nouveau_bo.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ nouveau_bo(struct ttm_buffer_object *bo) 
static inline void

nouveau_bo_fini(struct nouveau_bo *bo)

{

	ttm_bo_put(&bo->bo);

	ttm_bo_fini(&bo->bo);

}



extern struct ttm_device_funcs nouveau_bo_driver;