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.Signed-off-by: Jani Nikula <[email protected]> --- drivers/gpu/drm/i915/gem/i915_gem_object.c | 24 ------------------- .../i915/gem/i915_gem_object_frontbuffer.c | 24 +++++++++++++++++++ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c index 798c920160cf..5172d3982654 100644 --- 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 adba3fa96c05..29076aefdfd8 100644 --- 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); + } +} -- 2.47.3
