Re: [PATCH v3 06/11] drm/i915: split intel_crtc_page_flip() into check() and commit()

Ville Syrjälä
2014-10-07T15:44:17Z

On Wed, Sep 24, 2014 at 02:20:27PM -0300, Gustavo Padovan wrote:
> From: Daniel Stone <daniels@collabora.com>
>
> Start the work of splitting the intel_crtc_page_flip() for later use
> by the atomic modesetting API.

At this time this doesn't really do anything so I don't see much point
in applying it, for now at least.

>
> Signed-off-by: Daniel Stone <daniels@collabora.com>
> Signed-off-by: Gustavo Padovan <gustavo.padovan@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 a583abd..3cb092c 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -9641,23 +9641,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
> @@ -9680,6 +9668,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;
>
> @@ -9823,6 +9832,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
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

--
Ville Syrjälä
Intel OTC