[RFC][PATCH 3/4] drm: i915: Pass gem object to intel_finish_fb()

[ville.syrj...@linux.intel.com]

From: Ville Syrj?l? <ville.syrj...@linux.intel.com>

intel_finish_fb() has no use for the drm_framebuffer metadata, so pass
the gem object directly.

Signed-off-by: Ville Syrj?l? <ville.syrjala at linux.intel.com>
---
 drivers/gpu/drm/i915/intel_atomic.c  |    2 +-
 drivers/gpu/drm/i915/intel_display.c |    7 +++----
 drivers/gpu/drm/i915/intel_drv.h     |    2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_atomic.c 
b/drivers/gpu/drm/i915/intel_atomic.c
index e9eaa8a..0a96d15 100644
--- a/drivers/gpu/drm/i915/intel_atomic.c
+++ b/drivers/gpu/drm/i915/intel_atomic.c
@@ -797,7 +797,7 @@ static void unpin_work_func(struct work_struct *work)
                                intel_wait_for_vblank(dev, pipe);
                                vblank_waited |= 1 << pipe;
                        }
-                       intel_finish_fb(fb);
+                       intel_finish_fb(obj);
                        intel_unpin_fb_obj(obj);

                        mutex_unlock(&dev->struct_mutex);
diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index 46fb4d1..01c1a19 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2188,9 +2188,8 @@ intel_pipe_set_base_atomic(struct drm_crtc *crtc, struct 
drm_framebuffer *fb,
 }

 int
-intel_finish_fb(struct drm_framebuffer *old_fb)
+intel_finish_fb(struct drm_i915_gem_object *obj)
 {
-       struct drm_i915_gem_object *obj = to_intel_framebuffer(old_fb)->obj;
        struct drm_i915_private *dev_priv = obj->base.dev->dev_private;
        bool was_interruptible = dev_priv->mm.interruptible;
        int ret;
@@ -2250,7 +2249,7 @@ _intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
        }

        if (old_fb)
-               intel_finish_fb(old_fb);
+               intel_finish_fb(to_intel_framebuffer(old_fb)->obj);

        ret = dev_priv->display.update_plane(crtc, crtc->fb, x, y);
        if (ret) {
@@ -2862,7 +2861,7 @@ static void intel_crtc_wait_for_pending_flips(struct 
drm_crtc *crtc)
                return;

        mutex_lock(&dev->struct_mutex);
-       intel_finish_fb(crtc->fb);
+       intel_finish_fb(to_intel_framebuffer(crtc->fb)->obj);
        mutex_unlock(&dev->struct_mutex);
 }

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 9deb3f4..fa81676 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -440,7 +440,7 @@ extern int intel_pin_and_fence_fb_obj(struct drm_device 
*dev,
                                      struct drm_i915_gem_object *obj,
                                      struct intel_ring_buffer *pipelined);
 extern void intel_unpin_fb_obj(struct drm_i915_gem_object *obj);
-extern int intel_finish_fb(struct drm_framebuffer *fb);
+extern int intel_finish_fb(struct drm_i915_gem_object *obj);

 extern int intel_framebuffer_init(struct drm_device *dev,
                                  struct intel_framebuffer *ifb,
-- 
1.7.8.6