diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-04-28 15:07:22 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-04-28 15:07:43 +1000 |
| commit | feb68037784ac09e333a321d294fdb2d8c57a4c8 (patch) | |
| tree | 605e2968df49ad774b9f332d83260cc8b68a3b20 | |
| parent | 6e860d08d0f5b1e9a2d711aaf9fd6b982aa8039e (diff) | |
move i915 to new drm_wait_on function
| -rw-r--r-- | shared-core/i915_irq.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c index 4047e77e..8748b647 100644 --- a/shared-core/i915_irq.c +++ b/shared-core/i915_irq.c @@ -381,6 +381,13 @@ void i915_user_irq_off(drm_i915_private_t *dev_priv) spin_unlock(&dev_priv->user_irq_lock); } +static int wait_compare(struct drm_device *dev, void *priv) +{ + drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; + int irq_nr = (u64)priv; + + return (READ_BREADCRUMB(dev_priv) >= irq_nr); +} static int i915_wait_irq(drm_device_t * dev, int irq_nr) { @@ -396,8 +403,8 @@ static int i915_wait_irq(drm_device_t * dev, int irq_nr) dev_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT; i915_user_irq_on(dev_priv); - DRM_WAIT_ON(ret, dev_priv->irq_queue, 3 * DRM_HZ, - READ_BREADCRUMB(dev_priv) >= irq_nr); + ret = drm_wait_on(dev, &dev_priv->irq_queue, 3 * DRM_HZ, wait_compare, + (void *)(u64)irq_nr); i915_user_irq_off(dev_priv); if (ret == DRM_ERR(EBUSY)) { |