Merge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot-irq-quirks

1 files changed, 422 insertions, 161 deletions

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index df036118b8b1..26f48932a51e 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -31,16 +31,62 @@
 #include "i915_drm.h"
 #include "i915_drv.h"
 
-#define USER_INT_FLAG (1<<1)
-#define VSYNC_PIPEB_FLAG (1<<5)
-#define VSYNC_PIPEA_FLAG (1<<7)
-
 #define MAX_NOPID ((u32)~0)
 
+/** These are the interrupts used by the driver */
+#define I915_INTERRUPT_ENABLE_MASK (I915_USER_INTERRUPT |               \
+                                    I915_ASLE_INTERRUPT |               \
+                                    I915_DISPLAY_PIPE_A_EVENT_INTERRUPT | \
+                                    I915_DISPLAY_PIPE_B_EVENT_INTERRUPT)
+
+void
+i915_enable_irq(drm_i915_private_t *dev_priv, u32 mask)
+{
+        if ((dev_priv->irq_mask_reg & mask) != 0) {
+                dev_priv->irq_mask_reg &= ~mask;
+                I915_WRITE(IMR, dev_priv->irq_mask_reg);
+                (void) I915_READ(IMR);
+        }
+}
+
+static inline void
+i915_disable_irq(drm_i915_private_t *dev_priv, u32 mask)
+{
+        if ((dev_priv->irq_mask_reg & mask) != mask) {
+                dev_priv->irq_mask_reg |= mask;
+                I915_WRITE(IMR, dev_priv->irq_mask_reg);
+                (void) I915_READ(IMR);
+        }
+}
+
+/**
+ * i915_pipe_enabled - check if a pipe is enabled
+ * @dev: DRM device
+ * @pipe: pipe to check
+ *
+ * Reading certain registers when the pipe is disabled can hang the chip.
+ * Use this routine to make sure the PLL is running and the pipe is active
+ * before reading such registers if unsure.
+ */
+static int
+i915_pipe_enabled(struct drm_device *dev, int pipe)
+{
+        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        unsigned long pipeconf = pipe ? PIPEBCONF : PIPEACONF;
+
+        if (I915_READ(pipeconf) & PIPEACONF_ENABLE)
+                return 1;
+
+        return 0;
+}
+
 /**
  * Emit blits for scheduled buffer swaps.
  *
  * This function will be called with the HW lock held.
+ * Because this function must grab the ring mutex (dev->struct_mutex),
+ * it can no longer run at soft irq time. We'll fix this when we do
+ * the DRI2 swap buffer work.
  */
 static void i915_vblank_tasklet(struct drm_device *dev)
 {
@@ -48,8 +94,7 @@ static void i915_vblank_tasklet(struct drm_device *dev)
         unsigned long irqflags;
         struct list_head *list, *tmp, hits, *hit;
         int nhits, nrects, slice[2], upper[2], lower[2], i;
-        unsigned counter[2] = { atomic_read(&dev->vbl_received),
-                                atomic_read(&dev->vbl_received2) };
+        unsigned counter[2];
         struct drm_drawable_info *drw;
         drm_i915_sarea_t *sarea_priv = dev_priv->sarea_priv;
         u32 cpp = dev_priv->cpp;
@@ -62,6 +107,8 @@ static void i915_vblank_tasklet(struct drm_device *dev)
         u32 ropcpp = (0xcc << 16) | ((cpp - 1) << 24);
         RING_LOCALS;
 
+        mutex_lock(&dev->struct_mutex);
+
         if (IS_I965G(dev) && sarea_priv->front_tiled) {
                 cmd |= XY_SRC_COPY_BLT_DST_TILED;
                 dst_pitch >>= 2;
@@ -71,6 +118,9 @@ static void i915_vblank_tasklet(struct drm_device *dev)
                 src_pitch >>= 2;
         }
 
+        counter[0] = drm_vblank_count(dev, 0);
+        counter[1] = drm_vblank_count(dev, 1);
+
         DRM_DEBUG("\n");
 
         INIT_LIST_HEAD(&hits);
@@ -83,32 +133,33 @@ static void i915_vblank_tasklet(struct drm_device *dev)
         list_for_each_safe(list, tmp, &dev_priv->vbl_swaps.head) {
                 drm_i915_vbl_swap_t *vbl_swap =
                         list_entry(list, drm_i915_vbl_swap_t, head);
+                int pipe = vbl_swap->pipe;
 
-                if ((counter[vbl_swap->pipe] - vbl_swap->sequence) > (1<<23))
+                if ((counter[pipe] - vbl_swap->sequence) > (1<<23))
                         continue;
 
                 list_del(list);
                 dev_priv->swaps_pending--;
+                drm_vblank_put(dev, pipe);
 
                 spin_unlock(&dev_priv->swaps_lock);
                 spin_lock(&dev->drw_lock);
 
                 drw = drm_get_drawable_info(dev, vbl_swap->drw_id);
 
-                if (!drw) {
-                        spin_unlock(&dev->drw_lock);
-                        drm_free(vbl_swap, sizeof(*vbl_swap), DRM_MEM_DRIVER);
-                        spin_lock(&dev_priv->swaps_lock);
-                        continue;
-                }
-
                 list_for_each(hit, &hits) {
                         drm_i915_vbl_swap_t *swap_cmp =
                                 list_entry(hit, drm_i915_vbl_swap_t, head);
                         struct drm_drawable_info *drw_cmp =
                                 drm_get_drawable_info(dev, swap_cmp->drw_id);
 
-                        if (drw_cmp &&
+                        /* Make sure both drawables are still
+                         * around and have some rectangles before
+                         * we look inside to order them for the
+                         * blts below.
+                         */
+                        if (drw_cmp && drw_cmp->num_rects > 0 &&
+                            drw && drw->num_rects > 0 &&
                             drw_cmp->rects[0].y1 > drw->rects[0].y1) {
                                 list_add_tail(list, hit);
                                 break;
@@ -128,6 +179,7 @@ static void i915_vblank_tasklet(struct drm_device *dev)
 
         if (nhits == 0) {
                 spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
+                mutex_unlock(&dev->struct_mutex);
                 return;
         }
 
@@ -186,6 +238,9 @@ static void i915_vblank_tasklet(struct drm_device *dev)
 
                         drw = drm_get_drawable_info(dev, swap_hit->drw_id);
 
+                        /* The drawable may have been destroyed since
+                         * the vblank swap was queued
+                         */
                         if (!drw)
                                 continue;
 
@@ -218,6 +273,7 @@ static void i915_vblank_tasklet(struct drm_device *dev)
         }
 
         spin_unlock_irqrestore(&dev->drw_lock, irqflags);
+        mutex_unlock(&dev->struct_mutex);
 
         list_for_each_safe(hit, tmp, &hits) {
                 drm_i915_vbl_swap_t *swap_hit =
@@ -229,63 +285,157 @@ static void i915_vblank_tasklet(struct drm_device *dev)
         }
 }
 
+/* Called from drm generic code, passed a 'crtc', which
+ * we use as a pipe index
+ */
+u32 i915_get_vblank_counter(struct drm_device *dev, int pipe)
+{
+        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        unsigned long high_frame;
+        unsigned long low_frame;
+        u32 high1, high2, low, count;
+
+        high_frame = pipe ? PIPEBFRAMEHIGH : PIPEAFRAMEHIGH;
+        low_frame = pipe ? PIPEBFRAMEPIXEL : PIPEAFRAMEPIXEL;
+
+        if (!i915_pipe_enabled(dev, pipe)) {
+                DRM_ERROR("trying to get vblank count for disabled pipe %d\n", pipe);
+                return 0;
+        }
+
+        /*
+         * High & low register fields aren't synchronized, so make sure
+         * we get a low value that's stable across two reads of the high
+         * register.
+         */
+        do {
+                high1 = ((I915_READ(high_frame) & PIPE_FRAME_HIGH_MASK) >>
+                         PIPE_FRAME_HIGH_SHIFT);
+                low =  ((I915_READ(low_frame) & PIPE_FRAME_LOW_MASK) >>
+                        PIPE_FRAME_LOW_SHIFT);
+                high2 = ((I915_READ(high_frame) & PIPE_FRAME_HIGH_MASK) >>
+                         PIPE_FRAME_HIGH_SHIFT);
+        } while (high1 != high2);
+
+        count = (high1 << 8) | low;
+
+        return count;
+}
+
+void
+i915_vblank_work_handler(struct work_struct *work)
+{
+        drm_i915_private_t *dev_priv = container_of(work, drm_i915_private_t,
+                                                    vblank_work);
+        struct drm_device *dev = dev_priv->dev;
+        unsigned long irqflags;
+
+        if (dev->lock.hw_lock == NULL) {
+                i915_vblank_tasklet(dev);
+                return;
+        }
+
+        spin_lock_irqsave(&dev->tasklet_lock, irqflags);
+        dev->locked_tasklet_func = i915_vblank_tasklet;
+        spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
+
+        /* Try to get the lock now, if this fails, the lock
+         * holder will execute the tasklet during unlock
+         */
+        if (!drm_lock_take(&dev->lock, DRM_KERNEL_CONTEXT))
+                return;
+
+        dev->lock.lock_time = jiffies;
+        atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
+
+        spin_lock_irqsave(&dev->tasklet_lock, irqflags);
+        dev->locked_tasklet_func = NULL;
+        spin_unlock_irqrestore(&dev->tasklet_lock, irqflags);
+
+        i915_vblank_tasklet(dev);
+        drm_lock_free(&dev->lock, DRM_KERNEL_CONTEXT);
+}
+
 irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 {
         struct drm_device *dev = (struct drm_device *) arg;
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        u16 temp;
+        u32 iir;
         u32 pipea_stats, pipeb_stats;
+        int vblank = 0;
 
-        pipea_stats = I915_READ(I915REG_PIPEASTAT);
-        pipeb_stats = I915_READ(I915REG_PIPEBSTAT);
+        atomic_inc(&dev_priv->irq_received);
 
-        temp = I915_READ16(I915REG_INT_IDENTITY_R);
+        if (dev->pdev->msi_enabled)
+                I915_WRITE(IMR, ~0);
+        iir = I915_READ(IIR);
 
-        temp &= (USER_INT_FLAG | VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG);
+        if (iir == 0) {
+                if (dev->pdev->msi_enabled) {
+                        I915_WRITE(IMR, dev_priv->irq_mask_reg);
+                        (void) I915_READ(IMR);
+                }
+                return IRQ_NONE;
+        }
 
-        DRM_DEBUG("%s flag=%08x\n", __FUNCTION__, temp);
+        /*
+         * Clear the PIPE(A|B)STAT regs before the IIR otherwise
+         * we may get extra interrupts.
+         */
+        if (iir & I915_DISPLAY_PIPE_A_EVENT_INTERRUPT) {
+                pipea_stats = I915_READ(PIPEASTAT);
+                if (!(dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_A))
+                        pipea_stats &= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE |
+                                         PIPE_VBLANK_INTERRUPT_ENABLE);
+                else if (pipea_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS|
+                                        PIPE_VBLANK_INTERRUPT_STATUS)) {
+                        vblank++;
+                        drm_handle_vblank(dev, 0);
+                }
 
-        if (temp == 0)
-                return IRQ_NONE;
+                I915_WRITE(PIPEASTAT, pipea_stats);
+        }
+        if (iir & I915_DISPLAY_PIPE_B_EVENT_INTERRUPT) {
+                pipeb_stats = I915_READ(PIPEBSTAT);
+                /* Ack the event */
+                I915_WRITE(PIPEBSTAT, pipeb_stats);
+
+                /* The vblank interrupt gets enabled even if we didn't ask for
+                   it, so make sure it's shut down again */
+                if (!(dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_B))
+                        pipeb_stats &= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE |
+                                         PIPE_VBLANK_INTERRUPT_ENABLE);
+                else if (pipeb_stats & (PIPE_START_VBLANK_INTERRUPT_STATUS|
+                                        PIPE_VBLANK_INTERRUPT_STATUS)) {
+                        vblank++;
+                        drm_handle_vblank(dev, 1);
+                }
 
-        I915_WRITE16(I915REG_INT_IDENTITY_R, temp);
-        (void) I915_READ16(I915REG_INT_IDENTITY_R);
-        DRM_READMEMORYBARRIER();
+                if (pipeb_stats & I915_LEGACY_BLC_EVENT_STATUS)
+                        opregion_asle_intr(dev);
+                I915_WRITE(PIPEBSTAT, pipeb_stats);
+        }
 
-        dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
+        I915_WRITE(IIR, iir);
+        if (dev->pdev->msi_enabled)
+                I915_WRITE(IMR, dev_priv->irq_mask_reg);
+        (void) I915_READ(IIR); /* Flush posted writes */
 
-        if (temp & USER_INT_FLAG)
-                DRM_WAKEUP(&dev_priv->irq_queue);
+        if (dev_priv->sarea_priv)
+                dev_priv->sarea_priv->last_dispatch =
+                        READ_BREADCRUMB(dev_priv);
 
-        if (temp & (VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG)) {
-                int vblank_pipe = dev_priv->vblank_pipe;
-
-                if ((vblank_pipe &
-                     (DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B))
-                    == (DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B)) {
-                        if (temp & VSYNC_PIPEA_FLAG)
-                                atomic_inc(&dev->vbl_received);
-                        if (temp & VSYNC_PIPEB_FLAG)
-                                atomic_inc(&dev->vbl_received2);
-                } else if (((temp & VSYNC_PIPEA_FLAG) &&
-                            (vblank_pipe & DRM_I915_VBLANK_PIPE_A)) ||
-                           ((temp & VSYNC_PIPEB_FLAG) &&
-                            (vblank_pipe & DRM_I915_VBLANK_PIPE_B)))
-                        atomic_inc(&dev->vbl_received);
-
-                DRM_WAKEUP(&dev->vbl_queue);
-                drm_vbl_send_signals(dev);
-
-                if (dev_priv->swaps_pending > 0)
-                        drm_locked_tasklet(dev, i915_vblank_tasklet);
-                I915_WRITE(I915REG_PIPEASTAT,
-                        pipea_stats|I915_VBLANK_INTERRUPT_ENABLE|
-                        I915_VBLANK_CLEAR);
-                I915_WRITE(I915REG_PIPEBSTAT,
-                        pipeb_stats|I915_VBLANK_INTERRUPT_ENABLE|
-                        I915_VBLANK_CLEAR);
+        if (iir & I915_USER_INTERRUPT) {
+                dev_priv->mm.irq_gem_seqno = i915_get_gem_seqno(dev);
+                DRM_WAKEUP(&dev_priv->irq_queue);
         }
 
+        if (iir & I915_ASLE_INTERRUPT)
+                opregion_asle_intr(dev);
+
+        if (vblank && dev_priv->swaps_pending > 0)
+                schedule_work(&dev_priv->vblank_work);
+
         return IRQ_HANDLED;
 }
 
@@ -298,23 +448,47 @@ static int i915_emit_irq(struct drm_device * dev)
 
         DRM_DEBUG("\n");
 
-        dev_priv->sarea_priv->last_enqueue = ++dev_priv->counter;
-
+        dev_priv->counter++;
         if (dev_priv->counter > 0x7FFFFFFFUL)
-                dev_priv->sarea_priv->last_enqueue = dev_priv->counter = 1;
+                dev_priv->counter = 1;
+        if (dev_priv->sarea_priv)
+                dev_priv->sarea_priv->last_enqueue = dev_priv->counter;
 
         BEGIN_LP_RING(6);
-        OUT_RING(CMD_STORE_DWORD_IDX);
-        OUT_RING(20);
+        OUT_RING(MI_STORE_DWORD_INDEX);
+        OUT_RING(5 << MI_STORE_DWORD_INDEX_SHIFT);
         OUT_RING(dev_priv->counter);
         OUT_RING(0);
         OUT_RING(0);
-        OUT_RING(GFX_OP_USER_INTERRUPT);
+        OUT_RING(MI_USER_INTERRUPT);
         ADVANCE_LP_RING();
 
         return dev_priv->counter;
 }
 
+void i915_user_irq_get(struct drm_device *dev)
+{
+        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        unsigned long irqflags;
+
+        spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
+        if (dev->irq_enabled && (++dev_priv->user_irq_refcount == 1))
+                i915_enable_irq(dev_priv, I915_USER_INTERRUPT);
+        spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
+}
+
+void i915_user_irq_put(struct drm_device *dev)
+{
+        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        unsigned long irqflags;
+
+        spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
+        BUG_ON(dev->irq_enabled && dev_priv->user_irq_refcount <= 0);
+        if (dev->irq_enabled && (--dev_priv->user_irq_refcount == 0))
+                i915_disable_irq(dev_priv, I915_USER_INTERRUPT);
+        spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
+}
+
 static int i915_wait_irq(struct drm_device * dev, int irq_nr)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
@@ -323,55 +497,34 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
         DRM_DEBUG("irq_nr=%d breadcrumb=%d\n", irq_nr,
                   READ_BREADCRUMB(dev_priv));
 
-        if (READ_BREADCRUMB(dev_priv) >= irq_nr)
+        if (READ_BREADCRUMB(dev_priv) >= irq_nr) {
+                if (dev_priv->sarea_priv) {
+                        dev_priv->sarea_priv->last_dispatch =
+                                READ_BREADCRUMB(dev_priv);
+                }
                 return 0;
+        }
 
-        dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
+        if (dev_priv->sarea_priv)
+                dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
 
+        i915_user_irq_get(dev);
         DRM_WAIT_ON(ret, dev_priv->irq_queue, 3 * DRM_HZ,
                     READ_BREADCRUMB(dev_priv) >= irq_nr);
+        i915_user_irq_put(dev);
 
         if (ret == -EBUSY) {
                 DRM_ERROR("EBUSY -- rec: %d emitted: %d\n",
                           READ_BREADCRUMB(dev_priv), (int)dev_priv->counter);
         }
 
-        dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv);
-        return ret;
-}
-
-static int i915_driver_vblank_do_wait(struct drm_device *dev, unsigned int *sequence,
-                                      atomic_t *counter)
-{
-        drm_i915_private_t *dev_priv = dev->dev_private;
-        unsigned int cur_vblank;
-        int ret = 0;
-
-        if (!dev_priv) {
-                DRM_ERROR("called with no initialization\n");
-                return -EINVAL;
-        }
-
-        DRM_WAIT_ON(ret, dev->vbl_queue, 3 * DRM_HZ,
-                    (((cur_vblank = atomic_read(counter))
-                        - *sequence) <= (1<<23)));
-
-        *sequence = cur_vblank;
+        if (dev_priv->sarea_priv)
+                dev_priv->sarea_priv->last_dispatch =
+                        READ_BREADCRUMB(dev_priv);
 
         return ret;
 }
 
-
-int i915_driver_vblank_wait(struct drm_device *dev, unsigned int *sequence)
-{
-        return i915_driver_vblank_do_wait(dev, sequence, &dev->vbl_received);
-}
-
-int i915_driver_vblank_wait2(struct drm_device *dev, unsigned int *sequence)
-{
-        return i915_driver_vblank_do_wait(dev, sequence, &dev->vbl_received2);
-}
-
 /* Needs the lock as it touches the ring.
  */
 int i915_irq_emit(struct drm_device *dev, void *data,
@@ -381,14 +534,15 @@ int i915_irq_emit(struct drm_device *dev, void *data,
         drm_i915_irq_emit_t *emit = data;
         int result;
 
-        LOCK_TEST_WITH_RETURN(dev, file_priv);
+        RING_LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         if (!dev_priv) {
                 DRM_ERROR("called with no initialization\n");
                 return -EINVAL;
         }
-
+        mutex_lock(&dev->struct_mutex);
         result = i915_emit_irq(dev);
+        mutex_unlock(&dev->struct_mutex);
 
         if (DRM_COPY_TO_USER(emit->irq_seq, &result, sizeof(int))) {
                 DRM_ERROR("copy_to_user\n");
@@ -414,18 +568,95 @@ int i915_irq_wait(struct drm_device *dev, void *data,
         return i915_wait_irq(dev, irqwait->irq_seq);
 }
 
-static void i915_enable_interrupt (struct drm_device *dev)
+/* Called from drm generic code, passed 'crtc' which
+ * we use as a pipe index
+ */
+int i915_enable_vblank(struct drm_device *dev, int pipe)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        u16 flag;
+        u32     pipestat_reg = 0;
+        u32     pipestat;
+        u32     interrupt = 0;
+        unsigned long irqflags;
 
-        flag = 0;
-        if (dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_A)
-                flag |= VSYNC_PIPEA_FLAG;
-        if (dev_priv->vblank_pipe & DRM_I915_VBLANK_PIPE_B)
-                flag |= VSYNC_PIPEB_FLAG;
+        switch (pipe) {
+        case 0:
+                pipestat_reg = PIPEASTAT;
+                interrupt = I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
+                break;
+        case 1:
+                pipestat_reg = PIPEBSTAT;
+                interrupt = I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
+                break;
+        default:
+                DRM_ERROR("tried to enable vblank on non-existent pipe %d\n",
+                          pipe);
+                return 0;
+        }
 
-        I915_WRITE16(I915REG_INT_ENABLE_R, USER_INT_FLAG | flag);
+        spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
+        /* Enabling vblank events in IMR comes before PIPESTAT write, or
+         * there's a race where the PIPESTAT vblank bit gets set to 1, so
+         * the OR of enabled PIPESTAT bits goes to 1, so the PIPExEVENT in
+         * ISR flashes to 1, but the IIR bit doesn't get set to 1 because
+         * IMR masks it.  It doesn't ever get set after we clear the masking
+         * in IMR because the ISR bit is edge, not level-triggered, on the
+         * OR of PIPESTAT bits.
+         */
+        i915_enable_irq(dev_priv, interrupt);
+        pipestat = I915_READ(pipestat_reg);
+        if (IS_I965G(dev))
+                pipestat |= PIPE_START_VBLANK_INTERRUPT_ENABLE;
+        else
+                pipestat |= PIPE_VBLANK_INTERRUPT_ENABLE;
+        /* Clear any stale interrupt status */
+        pipestat |= (PIPE_START_VBLANK_INTERRUPT_STATUS |
+                     PIPE_VBLANK_INTERRUPT_STATUS);
+        I915_WRITE(pipestat_reg, pipestat);
+        (void) I915_READ(pipestat_reg); /* Posting read */
+        spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
+
+        return 0;
+}
+
+/* Called from drm generic code, passed 'crtc' which
+ * we use as a pipe index
+ */
+void i915_disable_vblank(struct drm_device *dev, int pipe)
+{
+        drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        u32     pipestat_reg = 0;
+        u32     pipestat;
+        u32     interrupt = 0;
+        unsigned long irqflags;
+
+        switch (pipe) {
+        case 0:
+                pipestat_reg = PIPEASTAT;
+                interrupt = I915_DISPLAY_PIPE_A_EVENT_INTERRUPT;
+                break;
+        case 1:
+                pipestat_reg = PIPEBSTAT;
+                interrupt = I915_DISPLAY_PIPE_B_EVENT_INTERRUPT;
+                break;
+        default:
+                DRM_ERROR("tried to disable vblank on non-existent pipe %d\n",
+                          pipe);
+                return;
+                break;
+        }
+
+        spin_lock_irqsave(&dev_priv->user_irq_lock, irqflags);
+        i915_disable_irq(dev_priv, interrupt);
+        pipestat = I915_READ(pipestat_reg);
+        pipestat &= ~(PIPE_START_VBLANK_INTERRUPT_ENABLE |
+                      PIPE_VBLANK_INTERRUPT_ENABLE);
+        /* Clear any stale interrupt status */
+        pipestat |= (PIPE_START_VBLANK_INTERRUPT_STATUS |
+                     PIPE_VBLANK_INTERRUPT_STATUS);
+        I915_WRITE(pipestat_reg, pipestat);
+        (void) I915_READ(pipestat_reg); /* Posting read */
+        spin_unlock_irqrestore(&dev_priv->user_irq_lock, irqflags);
 }
 
 /* Set the vblank monitor pipe
@@ -434,22 +665,12 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
                          struct drm_file *file_priv)
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
-        drm_i915_vblank_pipe_t *pipe = data;
 
         if (!dev_priv) {
                 DRM_ERROR("called with no initialization\n");
                 return -EINVAL;
         }
 
-        if (pipe->pipe & ~(DRM_I915_VBLANK_PIPE_A|DRM_I915_VBLANK_PIPE_B)) {
-                DRM_ERROR("called with invalid pipe 0x%x\n", pipe->pipe);
-                return -EINVAL;
-        }
-
-        dev_priv->vblank_pipe = pipe->pipe;
-
-        i915_enable_interrupt (dev);
-
         return 0;
 }
 
@@ -458,19 +679,13 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
         drm_i915_vblank_pipe_t *pipe = data;
-        u16 flag;
 
         if (!dev_priv) {
                 DRM_ERROR("called with no initialization\n");
                 return -EINVAL;
         }
 
-        flag = I915_READ(I915REG_INT_ENABLE_R);
-        pipe->pipe = 0;
-        if (flag & VSYNC_PIPEA_FLAG)
-                pipe->pipe |= DRM_I915_VBLANK_PIPE_A;
-        if (flag & VSYNC_PIPEB_FLAG)
-                pipe->pipe |= DRM_I915_VBLANK_PIPE_B;
+        pipe->pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;
 
         return 0;
 }
@@ -483,12 +698,13 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
 {
         drm_i915_private_t *dev_priv = dev->dev_private;
         drm_i915_vblank_swap_t *swap = data;
-        drm_i915_vbl_swap_t *vbl_swap;
+        drm_i915_vbl_swap_t *vbl_swap, *vbl_old;
         unsigned int pipe, seqtype, curseq;
         unsigned long irqflags;
         struct list_head *list;
+        int ret;
 
-        if (!dev_priv) {
+        if (!dev_priv || !dev_priv->sarea_priv) {
                 DRM_ERROR("%s called with no initialization\n", __func__);
                 return -EINVAL;
         }
@@ -523,7 +739,14 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
 
         spin_unlock_irqrestore(&dev->drw_lock, irqflags);
 
-        curseq = atomic_read(pipe ? &dev->vbl_received2 : &dev->vbl_received);
+        /*
+         * We take the ref here and put it when the swap actually completes
+         * in the tasklet.
+         */
+        ret = drm_vblank_get(dev, pipe);
+        if (ret)
+                return ret;
+        curseq = drm_vblank_count(dev, pipe);
 
         if (seqtype == _DRM_VBLANK_RELATIVE)
                 swap->sequence += curseq;
@@ -533,46 +756,57 @@ int i915_vblank_swap(struct drm_device *dev, void *data,
                         swap->sequence = curseq + 1;
                 } else {
                         DRM_DEBUG("Missed target sequence\n");
+                        drm_vblank_put(dev, pipe);
                         return -EINVAL;
                 }
         }
 
+        vbl_swap = drm_calloc(1, sizeof(*vbl_swap), DRM_MEM_DRIVER);
+
+        if (!vbl_swap) {
+                DRM_ERROR("Failed to allocate memory to queue swap\n");
+                drm_vblank_put(dev, pipe);
+                return -ENOMEM;
+        }
+
+        vbl_swap->drw_id = swap->drawable;
+        vbl_swap->pipe = pipe;
+        vbl_swap->sequence = swap->sequence;
+
         spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
 
         list_for_each(list, &dev_priv->vbl_swaps.head) {
-                vbl_swap = list_entry(list, drm_i915_vbl_swap_t, head);
+                vbl_old = list_entry(list, drm_i915_vbl_swap_t, head);
 
-                if (vbl_swap->drw_id == swap->drawable &&
-                    vbl_swap->pipe == pipe &&
-                    vbl_swap->sequence == swap->sequence) {
+                if (vbl_old->drw_id == swap->drawable &&
+                    vbl_old->pipe == pipe &&
+                    vbl_old->sequence == swap->sequence) {
                         spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
+                        drm_vblank_put(dev, pipe);
+                        drm_free(vbl_swap, sizeof(*vbl_swap), DRM_MEM_DRIVER);
                         DRM_DEBUG("Already scheduled\n");
                         return 0;
                 }
         }
 
-        spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
-
-        if (dev_priv->swaps_pending >= 100) {
+        if (dev_priv->swaps_pending >= 10) {
                 DRM_DEBUG("Too many swaps queued\n");
+                DRM_DEBUG(" pipe 0: %d pipe 1: %d\n",
+                          drm_vblank_count(dev, 0),
+                          drm_vblank_count(dev, 1));
+
+                list_for_each(list, &dev_priv->vbl_swaps.head) {
+                        vbl_old = list_entry(list, drm_i915_vbl_swap_t, head);
+                        DRM_DEBUG("\tdrw %x pipe %d seq %x\n",
+                                  vbl_old->drw_id, vbl_old->pipe,
+                                  vbl_old->sequence);
+                }
+                spin_unlock_irqrestore(&dev_priv->swaps_lock, irqflags);
+                drm_vblank_put(dev, pipe);
+                drm_free(vbl_swap, sizeof(*vbl_swap), DRM_MEM_DRIVER);
                 return -EBUSY;
         }
 
-        vbl_swap = drm_calloc(1, sizeof(*vbl_swap), DRM_MEM_DRIVER);
-
-        if (!vbl_swap) {
-                DRM_ERROR("Failed to allocate memory to queue swap\n");
-                return -ENOMEM;
-        }
-
-        DRM_DEBUG("\n");
-
-        vbl_swap->drw_id = swap->drawable;
-        vbl_swap->pipe = pipe;
-        vbl_swap->sequence = swap->sequence;
-
-        spin_lock_irqsave(&dev_priv->swaps_lock, irqflags);
-
         list_add_tail(&vbl_swap->head, &dev_priv->vbl_swaps.head);
         dev_priv->swaps_pending++;
 
@@ -587,37 +821,64 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
 
-        I915_WRITE16(I915REG_HWSTAM, 0xfffe);
-        I915_WRITE16(I915REG_INT_MASK_R, 0x0);
-        I915_WRITE16(I915REG_INT_ENABLE_R, 0x0);
+        I915_WRITE(HWSTAM, 0xeffe);
+        I915_WRITE(IMR, 0xffffffff);
+        I915_WRITE(IER, 0x0);
 }
 
-void i915_driver_irq_postinstall(struct drm_device * dev)
+int i915_driver_irq_postinstall(struct drm_device *dev)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
+        int ret, num_pipes = 2;
 
         spin_lock_init(&dev_priv->swaps_lock);
         INIT_LIST_HEAD(&dev_priv->vbl_swaps.head);
+        INIT_WORK(&dev_priv->vblank_work, i915_vblank_work_handler);
         dev_priv->swaps_pending = 0;
 
-        if (!dev_priv->vblank_pipe)
-                dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A;
-        i915_enable_interrupt(dev);
+        /* Set initial unmasked IRQs to just the selected vblank pipes. */
+        dev_priv->irq_mask_reg = ~0;
+
+        ret = drm_vblank_init(dev, num_pipes);
+        if (ret)
+                return ret;
+
+        dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B;
+        dev_priv->irq_mask_reg &= ~I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT;
+        dev_priv->irq_mask_reg &= ~I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT;
+
+        dev->max_vblank_count = 0xffffff; /* only 24 bits of frame count */
+
+        dev_priv->irq_mask_reg &= I915_INTERRUPT_ENABLE_MASK;
+
+        I915_WRITE(IMR, dev_priv->irq_mask_reg);
+        I915_WRITE(IER, I915_INTERRUPT_ENABLE_MASK);
+        (void) I915_READ(IER);
+
+        opregion_enable_asle(dev);
         DRM_INIT_WAITQUEUE(&dev_priv->irq_queue);
+
+        return 0;
 }
 
 void i915_driver_irq_uninstall(struct drm_device * dev)
 {
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-        u16 temp;
+        u32 temp;
 
         if (!dev_priv)
                 return;
 
-        I915_WRITE16(I915REG_HWSTAM, 0xffff);
-        I915_WRITE16(I915REG_INT_MASK_R, 0xffff);
-        I915_WRITE16(I915REG_INT_ENABLE_R, 0x0);
+        dev_priv->vblank_pipe = 0;
+
+        I915_WRITE(HWSTAM, 0xffffffff);
+        I915_WRITE(IMR, 0xffffffff);
+        I915_WRITE(IER, 0x0);
 
-        temp = I915_READ16(I915REG_INT_IDENTITY_R);
-        I915_WRITE16(I915REG_INT_IDENTITY_R, temp);
+        temp = I915_READ(PIPEASTAT);
+        I915_WRITE(PIPEASTAT, temp);
+        temp = I915_READ(PIPEBSTAT);
+        I915_WRITE(PIPEBSTAT, temp);
+        temp = I915_READ(IIR);
+        I915_WRITE(IIR, temp);
 }