From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v3 06/11] drm/i915: split intel_crtc_page_flip() into check() and commit() Date: Tue, 7 Oct 2014 18:44:17 +0300 Message-ID: <20141007154417.GA32511@intel.com> References: <1411579232-8668-1-git-send-email-gustavo@padovan.org> <1411579232-8668-6-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline In-Reply-To: <1411579232-8668-6-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Gustavo Padovan Cc: intel-gfx@lists.freedesktop.org, Daniel Stone , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org On Wed, Sep 24, 2014 at 02:20:27PM -0300, Gustavo Padovan wrote: > From: Daniel Stone > = > 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 > Signed-off-by: Gustavo Padovan > --- > 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 =3D crtc->dev; > - struct drm_i915_private *dev_priv =3D dev->dev_private; > struct drm_framebuffer *old_fb =3D crtc->primary->fb; > - struct drm_i915_gem_object *obj =3D intel_fb_obj(fb); > - struct intel_crtc *intel_crtc =3D to_intel_crtc(crtc); > - enum pipe pipe =3D 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 *c= rtc, > fb->pitches[0] !=3D 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 =3D crtc->dev; > + struct drm_i915_private *dev_priv =3D dev->dev_private; > + struct drm_framebuffer *old_fb =3D crtc->primary->fb; > + struct drm_i915_gem_object *obj =3D intel_fb_obj(fb); > + struct intel_crtc *intel_crtc =3D to_intel_crtc(crtc); > + enum pipe pipe =3D 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 =3D 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 =3D { > .mode_set_base_atomic =3D intel_pipe_set_base_atomic, > .load_lut =3D 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=E4l=E4 Intel OTC