releases/3.6.2/drm-i915-call-drm_handle_vblank-before-finish_page_flip.patch

   1 From 74d44445afb9f50126eba052adeb89827cee88f3 Mon Sep 17 00:00:00 2001
   2 From: Daniel Vetter <daniel.vetter@ffwll.ch>
   3 Date: Tue, 2 Oct 2012 17:54:35 +0200
   4 Subject: drm/i915: call drm_handle_vblank before finish_page_flip
   5
   6 From: Daniel Vetter <daniel.vetter@ffwll.ch>
   7
   8 commit 74d44445afb9f50126eba052adeb89827cee88f3 upstream.
   9
  10 ... since finish_page_flip needs the vblank timestamp generated
  11 in drm_handle_vblank. Somehow all the gmch platforms get it right,
  12 but all the pch platform irq handlers get is wrong. Hooray for copy&
  13 pasting!
  14
  15 Currently this gets papered over by a gross hack in finish_page_flip.
  16 A second patch will remove that.
  17
  18 Note that without this, the new timestamp sanity checks in flip_test
  19 occasionally get tripped up, hence the cc: stable tag.
  20
  21 Reviewed-by: mario.kleiner@tuebingen.mpg.de
  22 Tested-by: Imre Deak <imre.deak@intel.com>
  23 Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  24 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  25
  26 ---
  27  drivers/gpu/drm/i915/i915_irq.c |   16 ++++++++--------
  28  1 file changed, 8 insertions(+), 8 deletions(-)
  29
  30 --- a/drivers/gpu/drm/i915/i915_irq.c
  31 +++ b/drivers/gpu/drm/i915/i915_irq.c
  32 @@ -680,12 +680,12 @@ static irqreturn_t ivybridge_irq_handler
  33                         intel_opregion_gse_intr(dev);
  34
  35                 for (i = 0; i < 3; i++) {
  36 +                       if (de_iir & (DE_PIPEA_VBLANK_IVB << (5 * i)))
  37 +                               drm_handle_vblank(dev, i);
  38                         if (de_iir & (DE_PLANEA_FLIP_DONE_IVB << (5 * i))) {
  39                                 intel_prepare_page_flip(dev, i);
  40                                 intel_finish_page_flip_plane(dev, i);
  41                         }
  42 -                       if (de_iir & (DE_PIPEA_VBLANK_IVB << (5 * i)))
  43 -                               drm_handle_vblank(dev, i);
  44                 }
  45
  46                 /* check event from PCH */
  47 @@ -767,6 +767,12 @@ static irqreturn_t ironlake_irq_handler(
  48         if (de_iir & DE_GSE)
  49                 intel_opregion_gse_intr(dev);
  50
  51 +       if (de_iir & DE_PIPEA_VBLANK)
  52 +               drm_handle_vblank(dev, 0);
  53 +
  54 +       if (de_iir & DE_PIPEB_VBLANK)
  55 +               drm_handle_vblank(dev, 1);
  56 +
  57         if (de_iir & DE_PLANEA_FLIP_DONE) {
  58                 intel_prepare_page_flip(dev, 0);
  59                 intel_finish_page_flip_plane(dev, 0);
  60 @@ -777,12 +783,6 @@ static irqreturn_t ironlake_irq_handler(
  61                 intel_finish_page_flip_plane(dev, 1);
  62         }
  63
  64 -       if (de_iir & DE_PIPEA_VBLANK)
  65 -               drm_handle_vblank(dev, 0);
  66 -
  67 -       if (de_iir & DE_PIPEB_VBLANK)
  68 -               drm_handle_vblank(dev, 1);
  69 -
  70         /* check event from PCH */
  71         if (de_iir & DE_PCH_EVENT) {
  72                 if (pch_iir & hotplug_mask)