diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-30 14:26:27 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-30 14:26:27 -0800 |
| commit | 63e8d9114dab88c101be2372cb1f83a4fe74d9c1 (patch) | |
| tree | 424e8f1bdc1daf12ad83a64958156245cd9f1de8 /drivers/char/drm/i915_irq.c | |
| parent | d1127e40e8d75cd3855e35424937c73d0bcec558 (diff) | |
| parent | 55eb061326765b2d0489387cfb3fc7dbd244f917 (diff) | |
| download | blackbird-op-linux-63e8d9114dab88c101be2372cb1f83a4fe74d9c1.tar.gz blackbird-op-linux-63e8d9114dab88c101be2372cb1f83a4fe74d9c1.zip | |
Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: remove drm_{alloc,free}_pages
drm: sis fix compile warning
drm: add new radeon PCI ids..
drm: read breadcrumb in IRQ handler
drm: fixup i915 breadcrumb read/write
drm: remove pointless checks in radeon_state
drm: fixup improper cast.
drm: rationalise some pci ids
drm: Add general-purpose packet for manipulating scratch registers (r300)
drm: rework radeon memory map (radeon 1.23)
drm: update r300 register names
drm: fixup PCI DMA support
Diffstat (limited to 'drivers/char/drm/i915_irq.c')
| -rw-r--r-- | drivers/char/drm/i915_irq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c index d3879ac9970f..a752afd86ab8 100644 --- a/drivers/char/drm/i915_irq.c +++ b/drivers/char/drm/i915_irq.c @@ -53,6 +53,8 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) I915_WRITE16(I915REG_INT_IDENTITY_R, temp); + dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv); + if (temp & USER_INT_FLAG) DRM_WAKEUP(&dev_priv->irq_queue); |
