Commit 33093232 authored by Boris Brezillon's avatar Boris Brezillon Committed by Matthew Brost
Browse files

drm/gpuvm: Kill drm_gpuva_init() 



drm_gpuva_init() only has one internal user, and given we are about to
add new optional fields, it only add maintenance burden for no real
benefit, so let's kill the thing now.

Cc: Danilo Krummrich <dakr@kernel.org>
Cc: Rob Clark <robin.clark@oss.qualcomm.com>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@collabora.com>
Acked-by: default avatarDanilo Krummrich <dakr@kernel.org>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
Signed-off-by: default avatarHimal Prasad Ghimiray <himal.prasad.ghimiray@intel.com>
Reviewed-by: default avatarRob Clark <robin.clark@oss.qualcomm.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Link: https://lore.kernel.org/r/20250819162058.2777306-3-himal.prasad.ghimiray@intel.com
parent 000a45dc

drivers/gpu/drm/msm/msm_gem_vma.c

+7 −1
Original line number Diff line number Diff line
@@ -371,6 +371,12 @@ struct drm_gpuva * 
msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem_object *obj,

		u64 offset, u64 range_start, u64 range_end)

{

	struct drm_gpuva_op_map op_map = {

		.va.addr = range_start,

		.va.range = range_end - range_start,

		.gem.obj = obj,

		.gem.offset = offset,

	};

	struct msm_gem_vm *vm = to_msm_vm(gpuvm);

	struct drm_gpuvm_bo *vm_bo;

	struct msm_gem_vma *vma;
@@ -399,7 +405,7 @@ msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem_object *obj, 
	if (obj)

		GEM_WARN_ON((range_end - range_start) > obj->size);



	drm_gpuva_init(&vma->base, range_start, range_end - range_start, obj, offset);

	drm_gpuva_init_from_op(&vma->base, &op_map);

	vma->mapped = false;



	ret = drm_gpuva_insert(&vm->base, &vma->base);

include/drm/drm_gpuvm.h

+4 −11
Original line number Diff line number Diff line
@@ -160,15 +160,6 @@ struct drm_gpuva *drm_gpuva_find_first(struct drm_gpuvm *gpuvm, 
struct drm_gpuva *drm_gpuva_find_prev(struct drm_gpuvm *gpuvm, u64 start);

struct drm_gpuva *drm_gpuva_find_next(struct drm_gpuvm *gpuvm, u64 end);



static inline void drm_gpuva_init(struct drm_gpuva *va, u64 addr, u64 range,

				  struct drm_gem_object *obj, u64 offset)

{

	va->va.addr = addr;

	va->va.range = range;

	va->gem.obj = obj;

	va->gem.offset = offset;

}



/**

 * drm_gpuva_invalidate() - sets whether the backing GEM of this &drm_gpuva is

 * invalidated
@@ -1089,8 +1080,10 @@ void drm_gpuva_ops_free(struct drm_gpuvm *gpuvm, 
static inline void drm_gpuva_init_from_op(struct drm_gpuva *va,

					  struct drm_gpuva_op_map *op)

{

	drm_gpuva_init(va, op->va.addr, op->va.range,

		       op->gem.obj, op->gem.offset);

	va->va.addr = op->va.addr;

	va->va.range = op->va.range;

	va->gem.obj = op->gem.obj;

	va->gem.offset = op->gem.offset;

}



/**