i915: Only schedule vblank tasklet if there are scheduled swaps pending.

This fixes issues on X server startup with versions of xf86-video-intel that
enable the IRQ before they have a context ID.

diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index fbc6674..76c3a81 100644 (file)
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -171,7 +171,8 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
                DRM_WAKEUP(&dev->vbl_queue);
                drm_vbl_send_signals(dev);
 
                DRM_WAKEUP(&dev->vbl_queue);
                drm_vbl_send_signals(dev);
 

-               drm_locked_tasklet(dev, i915_vblank_tasklet);
+               if (dev_priv->swaps_pending > 0)
+                       drm_locked_tasklet(dev, i915_vblank_tasklet);

        }
 
        return IRQ_HANDLED;
        }
 
        return IRQ_HANDLED;