From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH 1/2] drm/i915: call drm_handle_vblank before finish_page_flip Date: Wed, 03 Oct 2012 11:08:40 +0300 Message-ID: <1349251720.1026.0.camel@localhost> References: <1349193276-13908-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id EB9569E913 for ; Wed, 3 Oct 2012 01:08:43 -0700 (PDT) In-Reply-To: <1349193276-13908-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Daniel Vetter Cc: Intel Graphics Development , stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org On Tue, 2012-10-02 at 17:54 +0200, Daniel Vetter wrote: > ... since finish_page_flip needs the vblank timestamp generated > in drm_handle_vblank. Somehow all the gmch platforms get it right, > but all the pch platform irq handlers get is wrong. Hooray for copy& > pasting! > > Currently this gets papered over by a gross hack in finish_page_flip. > A second patch will remove that. > > Note that without this, the new timestamp sanity checks in flip_test > occasionally get tripped up, hence the cc: stable tag. > > Cc: stable@vger.kernel.org > Signed-off-by: Daniel Vetter Tested-by: Imre Deak > --- > drivers/gpu/drm/i915/i915_irq.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c > index d7f0066..1fc2489 100644 > --- a/drivers/gpu/drm/i915/i915_irq.c > +++ b/drivers/gpu/drm/i915/i915_irq.c > @@ -698,12 +698,12 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS) > intel_opregion_gse_intr(dev); > > for (i = 0; i < 3; i++) { > + if (de_iir & (DE_PIPEA_VBLANK_IVB << (5 * i))) > + drm_handle_vblank(dev, i); > if (de_iir & (DE_PLANEA_FLIP_DONE_IVB << (5 * i))) { > intel_prepare_page_flip(dev, i); > intel_finish_page_flip_plane(dev, i); > } > - if (de_iir & (DE_PIPEA_VBLANK_IVB << (5 * i))) > - drm_handle_vblank(dev, i); > } > > /* check event from PCH */ > @@ -785,6 +785,12 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS) > if (de_iir & DE_GSE) > intel_opregion_gse_intr(dev); > > + if (de_iir & DE_PIPEA_VBLANK) > + drm_handle_vblank(dev, 0); > + > + if (de_iir & DE_PIPEB_VBLANK) > + drm_handle_vblank(dev, 1); > + > if (de_iir & DE_PLANEA_FLIP_DONE) { > intel_prepare_page_flip(dev, 0); > intel_finish_page_flip_plane(dev, 0); > @@ -795,12 +801,6 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS) > intel_finish_page_flip_plane(dev, 1); > } > > - if (de_iir & DE_PIPEA_VBLANK) > - drm_handle_vblank(dev, 0); > - > - if (de_iir & DE_PIPEB_VBLANK) > - drm_handle_vblank(dev, 1); > - > /* check event from PCH */ > if (de_iir & DE_PCH_EVENT) { > if (pch_iir & hotplug_mask)