diff options
| author | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-11-24 12:22:56 +0000 |
|---|---|---|
| committer | Owain Ainsworth <oga@cvs.openbsd.org> | 2008-11-24 12:22:56 +0000 |
| commit | c041aed2d8fa09995cda918fcd05770ecdf9a777 (patch) | |
| tree | e3c7076c8c8755953d26794faf5648c6500f644c | |
| parent | b7da7f53876a3ddd051de7479279868e520ab9ef (diff) | |
Fixup wakeup pointers. interrupts work properly again.
| -rw-r--r-- | sys/dev/pci/drm/drmP.h | 2 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915_irq.c | 2 | ||||
| -rw-r--r-- | sys/dev/pci/drm/mga_irq.c | 2 | ||||
| -rw-r--r-- | sys/dev/pci/drm/radeon_irq.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/drm/drmP.h b/sys/dev/pci/drm/drmP.h index c4b3bd0fbb6..c0c71d6c449 100644 --- a/sys/dev/pci/drm/drmP.h +++ b/sys/dev/pci/drm/drmP.h @@ -236,7 +236,7 @@ DRM_SPINLOCK(&dev->irq_lock); \ while ( ret == 0 ) { \ if (condition) \ break; \ - ret = msleep(&(queue), &dev->irq_lock, \ + ret = msleep((queue), &dev->irq_lock, \ PZERO | PCATCH, "drmwtq", (timeout)); \ } \ DRM_SPINUNLOCK(&dev->irq_lock) diff --git a/sys/dev/pci/drm/i915_irq.c b/sys/dev/pci/drm/i915_irq.c index 315c4b97955..0fe89b323f4 100644 --- a/sys/dev/pci/drm/i915_irq.c +++ b/sys/dev/pci/drm/i915_irq.c @@ -231,7 +231,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS) dev_priv->sarea_priv->last_dispatch = READ_BREADCRUMB(dev_priv); if (iir & I915_USER_INTERRUPT) { - DRM_WAKEUP(&dev_priv); + DRM_WAKEUP(dev_priv); } if (pipea_stats & I915_VBLANK_INTERRUPT_STATUS) diff --git a/sys/dev/pci/drm/mga_irq.c b/sys/dev/pci/drm/mga_irq.c index df1c68664e9..9c49c42d5e8 100644 --- a/sys/dev/pci/drm/mga_irq.c +++ b/sys/dev/pci/drm/mga_irq.c @@ -83,7 +83,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS) } atomic_inc(&dev_priv->last_fence_retired); - DRM_WAKEUP(&dev_priv); + DRM_WAKEUP(dev_priv); handled = 1; } diff --git a/sys/dev/pci/drm/radeon_irq.c b/sys/dev/pci/drm/radeon_irq.c index 5ca8abf1e74..895de9c2082 100644 --- a/sys/dev/pci/drm/radeon_irq.c +++ b/sys/dev/pci/drm/radeon_irq.c @@ -199,7 +199,7 @@ irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS) /* SW interrupt */ if (stat & RADEON_SW_INT_TEST) - DRM_WAKEUP(&dev_priv); + DRM_WAKEUP(dev_priv); /* VBLANK interrupt */ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_RS690) { |