drm/i915/gem: unify i915 gem object frontbuffer function names

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_*().

Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Link: https://patch.msgid.link/3415b59497f2c3a79586600d259eeaf58be73498.1772475391.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_clflush.c b/drivers/gpu/drm/i915/gem/i915_gem_clflush.c
index 30cc08583cbdbd3ec2cd96915f1c64b0dccb765c..7782ba44fabd8316392c2dc2eecf2e3ab8c3ed25 100644 (file)
--- 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 ef3b14ae2e0dfd506f45829a3295762d2f36b92c..df7502391b504c82fb45520cb9762b57ab98bdc2 100644 (file)
--- 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 @@ out_unlock:
        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 29076aefdfd8b6cc76b375ba209584fe467fc26e..cf0b66eaf11b888c135e76c87de12cba636fea43 100644 (file)
--- 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 2133e29047c51b5e21a3e76d766ca53e61e9f1a1..1c250ce4ca66cc5b6d6654f17578ba4d4dac1e0d 100644 (file)
--- 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 ce2780ef97efa29620265ff42aefa0916eb10d00..e375afbf458ee217b0be4f31cd862048cfe521ee 100644 (file)
--- 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 160733619a4ace2880fe749249734eafa0c31235..7614917509142a11a00cd96172a28b97e0f36890 100644 (file)
--- 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;