Commit 550a42a8 authored by Thomas Hellström's avatar Thomas Hellström
Browse files

drm/xe: Rename ___xe_bo_create_locked() 



Don't start external function names with underscores.
Rename to xe_bo_init_locked().

Signed-off-by: default avatarThomas Hellström <thomas.hellstrom@linux.intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20250908101246.65025-10-thomas.hellstrom@linux.intel.com
parent eb289a5f

drivers/gpu/drm/xe/xe_bo.c

+19 −20
Original line number Diff line number Diff line
@@ -1163,7 +1163,7 @@ int xe_bo_notifier_prepare_pinned(struct xe_bo *bo) 
	if (bo->flags & XE_BO_FLAG_PINNED_NORESTORE)

		goto out_unlock_bo;



	backup = ___xe_bo_create_locked(xe, NULL, NULL, bo->ttm.base.resv, NULL, xe_bo_size(bo),

	backup = xe_bo_init_locked(xe, NULL, NULL, bo->ttm.base.resv, NULL, xe_bo_size(bo),

				   DRM_XE_GEM_CPU_CACHING_WB, ttm_bo_type_kernel,

				   XE_BO_FLAG_SYSTEM | XE_BO_FLAG_NEEDS_CPU_ACCESS |

				   XE_BO_FLAG_PINNED, exec);
@@ -1242,8 +1242,7 @@ int xe_bo_evict_pinned(struct xe_bo *bo) 
		goto out_unlock_bo;



	if (!backup) {

		backup = ___xe_bo_create_locked(xe, NULL, NULL, bo->ttm.base.resv,

						NULL, xe_bo_size(bo),

		backup = xe_bo_init_locked(xe, NULL, NULL, bo->ttm.base.resv, NULL, xe_bo_size(bo),

					   DRM_XE_GEM_CPU_CACHING_WB, ttm_bo_type_kernel,

					   XE_BO_FLAG_SYSTEM | XE_BO_FLAG_NEEDS_CPU_ACCESS |

					   XE_BO_FLAG_PINNED, exec);
@@ -2036,7 +2035,7 @@ void xe_bo_free(struct xe_bo *bo) 
}



/**

 * ___xe_bo_create_locked() - Initialize or create an xe_bo.

 * xe_bo_init_locked() - Initialize or create an xe_bo.

 * @xe: The xe device.

 * @bo: An already allocated buffer object or NULL

 * if the function should allocate a new one.
@@ -2056,7 +2055,7 @@ void xe_bo_free(struct xe_bo *bo) 
 *

 * Return: The buffer object on success. Negative error pointer on failure.

 */

struct xe_bo *___xe_bo_create_locked(struct xe_device *xe, struct xe_bo *bo,

struct xe_bo *xe_bo_init_locked(struct xe_device *xe, struct xe_bo *bo,

				struct xe_tile *tile, struct dma_resv *resv,

				struct ttm_lru_bulk_move *bulk, size_t size,

				u16 cpu_caching, enum ttm_bo_type type,
@@ -2252,7 +2251,7 @@ __xe_bo_create_locked(struct xe_device *xe, 
		}

	}



	bo = ___xe_bo_create_locked(xe, bo, tile, vm ? xe_vm_resv(vm) : NULL,

	bo = xe_bo_init_locked(xe, bo, tile, vm ? xe_vm_resv(vm) : NULL,

			       vm && !xe_vm_in_fault_mode(vm) &&

			       flags & XE_BO_FLAG_USER ?

			       &vm->lru_bulk_move : NULL, size,

drivers/gpu/drm/xe/xe_bo.h

+5 −5
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ struct sg_table; 
struct xe_bo *xe_bo_alloc(void);

void xe_bo_free(struct xe_bo *bo);



struct xe_bo *___xe_bo_create_locked(struct xe_device *xe, struct xe_bo *bo,

struct xe_bo *xe_bo_init_locked(struct xe_device *xe, struct xe_bo *bo,

				struct xe_tile *tile, struct dma_resv *resv,

				struct ttm_lru_bulk_move *bulk, size_t size,

				u16 cpu_caching, enum ttm_bo_type type,

drivers/gpu/drm/xe/xe_dma_buf.c

+3 −3
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ xe_dma_buf_init_obj(struct drm_device *dev, struct xe_bo *storage, 
		if (ret)

			break;



		bo = ___xe_bo_create_locked(xe, storage, NULL, resv, NULL, dma_buf->size,

		bo = xe_bo_init_locked(xe, storage, NULL, resv, NULL, dma_buf->size,

				       0, /* Will require 1way or 2way for vm_bind */

				       ttm_bo_type_sg, XE_BO_FLAG_SYSTEM, &exec);

		drm_exec_retry_on_contention(&exec);