[PATCH v2 05/10] drm/i915: split intel_crtc_page_flip() into check() and commit()

[Gustavo Padovan]

From: Daniel Stone <dani...@collabora.com>

Start the work of splitting the intel_crtc_page_flip() for later use
by the atomic modesetting API.

Signed-off-by: Daniel Stone <daniels at collabora.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
---
 drivers/gpu/drm/i915/intel_display.c | 51 ++++++++++++++++++++++++++----------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index 417b74d..f9ab8aa 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -9543,23 +9543,11 @@ void intel_check_page_flip(struct drm_device *dev, int 
pipe)
        spin_unlock(&dev->event_lock);
 }

-static int intel_crtc_page_flip(struct drm_crtc *crtc,
-                               struct drm_framebuffer *fb,
-                               struct drm_pending_vblank_event *event,
-                               uint32_t page_flip_flags)
+static int intel_crtc_check_page_flip(struct drm_crtc *crtc,
+                                     struct drm_framebuffer *fb)
 {
        struct drm_device *dev = crtc->dev;
-       struct drm_i915_private *dev_priv = dev->dev_private;
        struct drm_framebuffer *old_fb = crtc->primary->fb;
-       struct drm_i915_gem_object *obj = intel_fb_obj(fb);
-       struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-       enum pipe pipe = intel_crtc->pipe;
-       struct intel_unpin_work *work;
-       struct intel_engine_cs *ring;
-       int ret;
-
-       //trigger software GT busyness calculation
-       gen8_flip_interrupt(dev);

        /*
         * drm_mode_page_flip_ioctl() should already catch this, but double
@@ -9582,6 +9570,27 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
             fb->pitches[0] != crtc->primary->fb->pitches[0]))
                return -EINVAL;

+       return 0;
+}
+
+static int intel_crtc_commit_page_flip(struct drm_crtc *crtc,
+                                      struct drm_framebuffer *fb,
+                                      struct drm_pending_vblank_event *event,
+                                      uint32_t page_flip_flags)
+{
+       struct drm_device *dev = crtc->dev;
+       struct drm_i915_private *dev_priv = dev->dev_private;
+       struct drm_framebuffer *old_fb = crtc->primary->fb;
+       struct drm_i915_gem_object *obj = intel_fb_obj(fb);
+       struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+       enum pipe pipe = intel_crtc->pipe;
+       struct intel_unpin_work *work;
+       struct intel_engine_cs *ring;
+       int ret;
+
+       /* trigger software GT busyness calculation */
+       gen8_flip_interrupt(dev);
+
        if (i915_terminally_wedged(&dev_priv->gpu_error))
                goto out_hang;

@@ -9725,6 +9734,20 @@ out_hang:
        return ret;
 }

+static int intel_crtc_page_flip(struct drm_crtc *crtc,
+                               struct drm_framebuffer *fb,
+                               struct drm_pending_vblank_event *event,
+                               uint32_t page_flip_flags)
+{
+       int ret;
+
+       ret = intel_crtc_check_page_flip(crtc, fb);
+       if (ret)
+               return ret;
+
+       return intel_crtc_commit_page_flip(crtc, fb, event, page_flip_flags);
+}
+
 static struct drm_crtc_helper_funcs intel_helper_funcs = {
        .mode_set_base_atomic = intel_pipe_set_base_atomic,
        .load_lut = intel_crtc_load_lut,
-- 
1.9.3