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

drm/ttm: rename and cleanup ttm_bo_init 



Rename ttm_bo_init 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.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220707102453.3633-2-christian.koenig@amd.com


Reviewed-by: default avatarMichael J. Ruhl <michael.j.ruhl@intel.com>
parent 20529e26

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

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,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_reserved(&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

+3 −3
Original line number Diff line number Diff line
@@ -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(bdev, &gbo->bo, size, ttm_bo_type_device,

	ret = ttm_bo_init_validate(bdev, &gbo->bo, ttm_bo_type_device,

				   &gbo->placement, pg_align, false, NULL, NULL,

				   ttm_buffer_object_destroy);

	if (ret)

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

+2 −3
Original line number Diff line number Diff line
@@ -1229,9 +1229,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_reserved(&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

+3 −3
Original line number Diff line number Diff line
@@ -309,9 +309,9 @@ 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(nvbo->bo.bdev, &nvbo->bo, size, type,

			  &nvbo->placement, align >> PAGE_SHIFT, false, sg,

			  robj, nouveau_bo_del_ttm);

	ret = ttm_bo_init_validate(nvbo->bo.bdev, &nvbo->bo, type,

				   &nvbo->placement, align >> PAGE_SHIFT, false,

				   sg, robj, nouveau_bo_del_ttm);

	if (ret) {

		/* ttm will call nouveau_bo_del_ttm if it fails.. */

		return ret;

drivers/gpu/drm/qxl/qxl_object.c

+1 −1
Original line number Diff line number Diff line
@@ -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_reserved(&qdev->mman.bdev, &bo->tbo, type,

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

				 &qxl_ttm_bo_destroy);

	if (unlikely(r != 0)) {