drm/i915/gem: relocate __i915_gem_object_{flush, invalidate}_frontbuffer()

Move __i915_gem_object_{flush,invalidate}_frontbuffer() to
i915_gem_object_frontbuffer.c. All the other i915 gem object frontbuffer
functions are there already, and the relevant declarations are in
i915_gem_object_frontbuffer.h too.

Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
Link: https://patch.msgid.link/d779ef44b4b43feda9df63f1225a947a9cd23ba8.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_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c
index 3f6f040c359db0383f8f374eed3645b55fbd8ff6..70db29643dec0a77827c7f252a5144b8b6b05dac 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c
@@ -474,30 +474,6 @@ static void i915_gem_free_object(struct drm_gem_object *gem_obj)
                queue_work(i915->wq, &i915->mm.free_work);
 }
 
-void __i915_gem_object_flush_frontbuffer(struct drm_i915_gem_object *obj,
-                                        enum fb_op_origin origin)
-{
-       struct i915_frontbuffer *front;
-
-       front = i915_gem_object_frontbuffer_lookup(obj);
-       if (front) {
-               intel_frontbuffer_flush(&front->base, origin);
-               i915_gem_object_frontbuffer_put(front);
-       }
-}
-
-void __i915_gem_object_invalidate_frontbuffer(struct drm_i915_gem_object *obj,
-                                             enum fb_op_origin origin)
-{
-       struct i915_frontbuffer *front;
-
-       front = i915_gem_object_frontbuffer_lookup(obj);
-       if (front) {
-               intel_frontbuffer_invalidate(&front->base, origin);
-               i915_gem_object_frontbuffer_put(front);
-       }
-}
-
 static void
 i915_gem_object_read_from_page_kmap(struct drm_i915_gem_object *obj, u64 offset, void *dst, int size)
 {

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 adba3fa96c05d6b2f1f79ea0dfa8a2055608c4eb..29076aefdfd8b6cc76b375ba209584fe467fc26e 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.c
@@ -101,3 +101,27 @@ void i915_gem_object_frontbuffer_put(struct i915_frontbuffer *front)
        kref_put_lock(&front->ref, frontbuffer_release,
                      &i915->frontbuffer_lock);
 }
+
+void __i915_gem_object_flush_frontbuffer(struct drm_i915_gem_object *obj,
+                                        enum fb_op_origin origin)
+{
+       struct i915_frontbuffer *front;
+
+       front = i915_gem_object_frontbuffer_lookup(obj);
+       if (front) {
+               intel_frontbuffer_flush(&front->base, origin);
+               i915_gem_object_frontbuffer_put(front);
+       }
+}
+
+void __i915_gem_object_invalidate_frontbuffer(struct drm_i915_gem_object *obj,
+                                             enum fb_op_origin origin)
+{
+       struct i915_frontbuffer *front;
+
+       front = i915_gem_object_frontbuffer_lookup(obj);
+       if (front) {
+               intel_frontbuffer_invalidate(&front->base, origin);
+               i915_gem_object_frontbuffer_put(front);
+       }
+}