drm/i915/frontbuffer: convert intel_frontbuffer_get() to struct drm_gem_object

Prefer the driver agnostic struct drm_gem_object over i915 specific
struct drm_i915_gem_object.

Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/358cfcb5eb666732cd7ae21e4f63d07837960ec2.1726589119.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index 06bf254..6ac9642 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -1976,7 +1976,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
        if (ret)
                return ret;
 
-       intel_fb->frontbuffer = intel_frontbuffer_get(to_intel_bo(obj));
+       intel_fb->frontbuffer = intel_frontbuffer_get(obj);
        if (!intel_fb->frontbuffer) {
                ret = -ENOMEM;
                goto err;

diff --git a/drivers/gpu/drm/i915/display/intel_frontbuffer.c b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
index 1be7290..8d8b0a9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_frontbuffer.c
+++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.c
@@ -216,7 +216,7 @@ static void intel_frontbuffer_flush_work(struct work_struct *work)
        struct intel_frontbuffer *front =
                container_of(work, struct intel_frontbuffer, flush_work);
 
-       i915_gem_object_flush_if_display(front->obj);
+       intel_bo_flush_if_display(intel_bo_to_drm_bo(front->obj));
        intel_frontbuffer_flush(front, ORIGIN_DIRTYFB);
        intel_frontbuffer_put(front);
 }
@@ -276,12 +276,12 @@ static void frontbuffer_release(struct kref *ref)
 }
 
 struct intel_frontbuffer *
-intel_frontbuffer_get(struct drm_i915_gem_object *obj)
+intel_frontbuffer_get(struct drm_gem_object *obj)
 {
-       struct drm_i915_private *i915 = intel_bo_to_i915(obj);
+       struct drm_i915_private *i915 = to_i915(obj->dev);
        struct intel_frontbuffer *front, *cur;
 
-       front = intel_bo_get_frontbuffer(intel_bo_to_drm_bo(obj));
+       front = intel_bo_get_frontbuffer(obj);
        if (front)
                return front;
 
@@ -289,7 +289,7 @@ intel_frontbuffer_get(struct drm_i915_gem_object *obj)
        if (!front)
                return NULL;
 
-       front->obj = obj;
+       front->obj = to_intel_bo(obj);
        kref_init(&front->ref);
        atomic_set(&front->bits, 0);
        i915_active_init(&front->write,
@@ -299,7 +299,7 @@ intel_frontbuffer_get(struct drm_i915_gem_object *obj)
        INIT_WORK(&front->flush_work, intel_frontbuffer_flush_work);
 
        spin_lock(&i915->display.fb_tracking.lock);
-       cur = intel_bo_set_frontbuffer(intel_bo_to_drm_bo(obj), front);
+       cur = intel_bo_set_frontbuffer(obj, front);
        spin_unlock(&i915->display.fb_tracking.lock);
        if (cur != front)
                kfree(front);

diff --git a/drivers/gpu/drm/i915/display/intel_frontbuffer.h b/drivers/gpu/drm/i915/display/intel_frontbuffer.h
index abb51e8..128682b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_frontbuffer.h
+++ b/drivers/gpu/drm/i915/display/intel_frontbuffer.h
@@ -30,6 +30,7 @@
 
 #include "i915_active_types.h"
 
+struct drm_gem_object;
 struct drm_i915_private;
 
 enum fb_op_origin {
@@ -77,7 +78,7 @@ void intel_frontbuffer_flip(struct drm_i915_private *i915,
 void intel_frontbuffer_put(struct intel_frontbuffer *front);
 
 struct intel_frontbuffer *
-intel_frontbuffer_get(struct drm_i915_gem_object *obj);
+intel_frontbuffer_get(struct drm_gem_object *obj);
 
 void __intel_fb_invalidate(struct intel_frontbuffer *front,
                           enum fb_op_origin origin,

diff --git a/drivers/gpu/drm/i915/display/intel_overlay.c b/drivers/gpu/drm/i915/display/intel_overlay.c
index b895414..2ec1409 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_overlay.c
+++ b/drivers/gpu/drm/i915/display/intel_overlay.c
@@ -294,7 +294,7 @@ static void intel_overlay_flip_prepare(struct intel_overlay *overlay,
        drm_WARN_ON(&overlay->i915->drm, overlay->old_vma);
 
        if (vma)
-               frontbuffer = intel_frontbuffer_get(vma->obj);
+               frontbuffer = intel_frontbuffer_get(intel_bo_to_drm_bo(vma->obj));
 
        intel_frontbuffer_track(overlay->frontbuffer, frontbuffer,
                                INTEL_FRONTBUFFER_OVERLAY(pipe));