On Mon, 2026-03-02 at 20:17 +0200, Jani Nikula wrote: > Many of the i915 gem object frontbuffer function names follow the > file > name as prefix. Follow suit with the remaining functions, renaming > them > i915_gem_object_frontbuffer_*(). > > Signed-off-by: Jani Nikula <[email protected]>
Reviewed-by: Jouni Högander <[email protected]> > --- > drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 2 +- > drivers/gpu/drm/i915/gem/i915_gem_domain.c | 6 +++--- > .../gpu/drm/i915/gem/i915_gem_object_frontbuffer.c | 4 ++-- > .../gpu/drm/i915/gem/i915_gem_object_frontbuffer.h | 12 ++++++---- > -- > drivers/gpu/drm/i915/gem/i915_gem_phys.c | 4 ++-- > drivers/gpu/drm/i915/i915_gem.c | 6 +++--- > 6 files changed, 17 insertions(+), 17 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c > b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c > index 30cc08583cbd..7782ba44fabd 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c > @@ -22,7 +22,7 @@ static void __do_clflush(struct drm_i915_gem_object > *obj) > GEM_BUG_ON(!i915_gem_object_has_pages(obj)); > drm_clflush_sg(obj->mm.pages); > > - i915_gem_object_flush_frontbuffer(obj, ORIGIN_CPU); > + i915_gem_object_frontbuffer_flush(obj, ORIGIN_CPU); > } > > static void clflush_work(struct dma_fence_work *base) > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c > b/drivers/gpu/drm/i915/gem/i915_gem_domain.c > index ef3b14ae2e0d..df7502391b50 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c > @@ -68,7 +68,7 @@ flush_write_domain(struct drm_i915_gem_object *obj, > unsigned int flush_domains) > i915_vma_flush_writes(vma); > spin_unlock(&obj->vma.lock); > > - i915_gem_object_flush_frontbuffer(obj, ORIGIN_CPU); > + i915_gem_object_frontbuffer_flush(obj, ORIGIN_CPU); > break; > > case I915_GEM_DOMAIN_WC: > @@ -647,7 +647,7 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, > void *data, > i915_gem_object_unlock(obj); > > if (!err && write_domain) > - i915_gem_object_invalidate_frontbuffer(obj, > ORIGIN_CPU); > + i915_gem_object_frontbuffer_invalidate(obj, > ORIGIN_CPU); > > out: > i915_gem_object_put(obj); > @@ -759,7 +759,7 @@ int i915_gem_object_prepare_write(struct > drm_i915_gem_object *obj, > } > > out: > - i915_gem_object_invalidate_frontbuffer(obj, ORIGIN_CPU); > + i915_gem_object_frontbuffer_invalidate(obj, ORIGIN_CPU); > obj->mm.dirty = true; > /* return with the pages pinned */ > return 0; > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.c > b/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.c > index 29076aefdfd8..cf0b66eaf11b 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.c > @@ -102,7 +102,7 @@ void i915_gem_object_frontbuffer_put(struct > i915_frontbuffer *front) > &i915->frontbuffer_lock); > } > > -void __i915_gem_object_flush_frontbuffer(struct drm_i915_gem_object > *obj, > +void __i915_gem_object_frontbuffer_flush(struct drm_i915_gem_object > *obj, > enum fb_op_origin origin) > { > struct i915_frontbuffer *front; > @@ -114,7 +114,7 @@ void __i915_gem_object_flush_frontbuffer(struct > drm_i915_gem_object *obj, > } > } > > -void __i915_gem_object_invalidate_frontbuffer(struct > drm_i915_gem_object *obj, > +void __i915_gem_object_frontbuffer_invalidate(struct > drm_i915_gem_object *obj, > enum fb_op_origin > origin) > { > struct i915_frontbuffer *front; > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.h > b/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.h > index 2133e29047c5..1c250ce4ca66 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.h > +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.h > @@ -20,25 +20,25 @@ struct i915_frontbuffer { > struct kref ref; > }; > > -void __i915_gem_object_flush_frontbuffer(struct drm_i915_gem_object > *obj, > +void __i915_gem_object_frontbuffer_flush(struct drm_i915_gem_object > *obj, > enum fb_op_origin origin); > -void __i915_gem_object_invalidate_frontbuffer(struct > drm_i915_gem_object *obj, > +void __i915_gem_object_frontbuffer_invalidate(struct > drm_i915_gem_object *obj, > enum fb_op_origin > origin); > > static inline void > -i915_gem_object_flush_frontbuffer(struct drm_i915_gem_object *obj, > +i915_gem_object_frontbuffer_flush(struct drm_i915_gem_object *obj, > enum fb_op_origin origin) > { > if (unlikely(rcu_access_pointer(obj->frontbuffer))) > - __i915_gem_object_flush_frontbuffer(obj, origin); > + __i915_gem_object_frontbuffer_flush(obj, origin); > } > > static inline void > -i915_gem_object_invalidate_frontbuffer(struct drm_i915_gem_object > *obj, > +i915_gem_object_frontbuffer_invalidate(struct drm_i915_gem_object > *obj, > enum fb_op_origin origin) > { > if (unlikely(rcu_access_pointer(obj->frontbuffer))) > - __i915_gem_object_invalidate_frontbuffer(obj, > origin); > + __i915_gem_object_frontbuffer_invalidate(obj, > origin); > } > > struct i915_frontbuffer *i915_gem_object_frontbuffer_get(struct > drm_i915_gem_object *obj); > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_phys.c > b/drivers/gpu/drm/i915/gem/i915_gem_phys.c > index ce2780ef97ef..e375afbf458e 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_phys.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_phys.c > @@ -155,7 +155,7 @@ int i915_gem_object_pwrite_phys(struct > drm_i915_gem_object *obj, > * We manually control the domain here and pretend that it > * remains coherent i.e. in the GTT domain, like > shmem_pwrite. > */ > - i915_gem_object_invalidate_frontbuffer(obj, ORIGIN_CPU); > + i915_gem_object_frontbuffer_invalidate(obj, ORIGIN_CPU); > > if (copy_from_user(vaddr, user_data, args->size)) > return -EFAULT; > @@ -163,7 +163,7 @@ int i915_gem_object_pwrite_phys(struct > drm_i915_gem_object *obj, > drm_clflush_virt_range(vaddr, args->size); > intel_gt_chipset_flush(to_gt(i915)); > > - i915_gem_object_flush_frontbuffer(obj, ORIGIN_CPU); > + i915_gem_object_frontbuffer_flush(obj, ORIGIN_CPU); > return 0; > } > > diff --git a/drivers/gpu/drm/i915/i915_gem.c > b/drivers/gpu/drm/i915/i915_gem.c > index 160733619a4a..761491750914 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -579,7 +579,7 @@ i915_gem_gtt_pwrite_fast(struct > drm_i915_gem_object *obj, > goto out_rpm; > } > > - i915_gem_object_invalidate_frontbuffer(obj, ORIGIN_CPU); > + i915_gem_object_frontbuffer_invalidate(obj, ORIGIN_CPU); > > user_data = u64_to_user_ptr(args->data_ptr); > offset = args->offset; > @@ -626,7 +626,7 @@ i915_gem_gtt_pwrite_fast(struct > drm_i915_gem_object *obj, > } > > intel_gt_flush_ggtt_writes(ggtt->vm.gt); > - i915_gem_object_flush_frontbuffer(obj, ORIGIN_CPU); > + i915_gem_object_frontbuffer_flush(obj, ORIGIN_CPU); > > i915_gem_gtt_cleanup(obj, &node, vma); > out_rpm: > @@ -714,7 +714,7 @@ i915_gem_shmem_pwrite(struct drm_i915_gem_object > *obj, > offset = 0; > } > > - i915_gem_object_flush_frontbuffer(obj, ORIGIN_CPU); > + i915_gem_object_frontbuffer_flush(obj, ORIGIN_CPU); > > i915_gem_object_unpin_pages(obj); > return ret;
