Skip to content

Commit 3309323

Browse files
bbrezillonmbrost05
authored andcommitted
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: Boris Brezillon <boris.brezillon@collabora.com> Acked-by: Danilo Krummrich <dakr@kernel.org> Reviewed-by: Matthew Brost <matthew.brost@intel.com> Signed-off-by: Himal Prasad Ghimiray <himal.prasad.ghimiray@intel.com> Reviewed-by: Rob Clark <robin.clark@oss.qualcomm.com> Signed-off-by: Matthew Brost <matthew.brost@intel.com> Link: https://lore.kernel.org/r/20250819162058.2777306-3-himal.prasad.ghimiray@intel.com
1 parent 000a45d commit 3309323

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

drivers/gpu/drm/msm/msm_gem_vma.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,12 @@ struct drm_gpuva *
371371
msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem_object *obj,
372372
u64 offset, u64 range_start, u64 range_end)
373373
{
374+
struct drm_gpuva_op_map op_map = {
375+
.va.addr = range_start,
376+
.va.range = range_end - range_start,
377+
.gem.obj = obj,
378+
.gem.offset = offset,
379+
};
374380
struct msm_gem_vm *vm = to_msm_vm(gpuvm);
375381
struct drm_gpuvm_bo *vm_bo;
376382
struct msm_gem_vma *vma;
@@ -399,7 +405,7 @@ msm_gem_vma_new(struct drm_gpuvm *gpuvm, struct drm_gem_object *obj,
399405
if (obj)
400406
GEM_WARN_ON((range_end - range_start) > obj->size);
401407

402-
drm_gpuva_init(&vma->base, range_start, range_end - range_start, obj, offset);
408+
drm_gpuva_init_from_op(&vma->base, &op_map);
403409
vma->mapped = false;
404410

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

include/drm/drm_gpuvm.h

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,6 @@ struct drm_gpuva *drm_gpuva_find_first(struct drm_gpuvm *gpuvm,
160160
struct drm_gpuva *drm_gpuva_find_prev(struct drm_gpuvm *gpuvm, u64 start);
161161
struct drm_gpuva *drm_gpuva_find_next(struct drm_gpuvm *gpuvm, u64 end);
162162

163-
static inline void drm_gpuva_init(struct drm_gpuva *va, u64 addr, u64 range,
164-
struct drm_gem_object *obj, u64 offset)
165-
{
166-
va->va.addr = addr;
167-
va->va.range = range;
168-
va->gem.obj = obj;
169-
va->gem.offset = offset;
170-
}
171-
172163
/**
173164
* drm_gpuva_invalidate() - sets whether the backing GEM of this &drm_gpuva is
174165
* invalidated
@@ -1089,8 +1080,10 @@ void drm_gpuva_ops_free(struct drm_gpuvm *gpuvm,
10891080
static inline void drm_gpuva_init_from_op(struct drm_gpuva *va,
10901081
struct drm_gpuva_op_map *op)
10911082
{
1092-
drm_gpuva_init(va, op->va.addr, op->va.range,
1093-
op->gem.obj, op->gem.offset);
1083+
va->va.addr = op->va.addr;
1084+
va->va.range = op->va.range;
1085+
va->gem.obj = op->gem.obj;
1086+
va->gem.offset = op->gem.offset;
10941087
}
10951088

10961089
/**

0 commit comments

Comments
 (0)