summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <airlied@linux.ie>2007-06-03 18:11:44 +1000
committerroot <airlied@linux.ie>2007-06-03 18:11:44 +1000
commit8d95f4bd91fcc46b3e59767cb86b6c99bc8679c3 (patch)
treefd93d8a6288edb921a9b10fcd96465bf39d143ab
parent4e9d215bdfe72588cbacdb17ab9b60a42a43aefb (diff)
Revert "move i915 to new drm_wait_on function"
This reverts commit feb68037784ac09e333a321d294fdb2d8c57a4c8. This was a bad idea, the macro is actually a bit harder to convert to a static for the other use cases
-rw-r--r--shared-core/i915_irq.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/shared-core/i915_irq.c b/shared-core/i915_irq.c
index 7955a2e8..dc00f983 100644
--- a/shared-core/i915_irq.c
+++ b/shared-core/i915_irq.c
@@ -381,13 +381,6 @@ 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)
{
@@ -403,8 +396,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);
- ret = drm_wait_on(dev, &dev_priv->irq_queue, 3 * DRM_HZ, wait_compare,
- (void *)(u64)irq_nr);
+ DRM_WAIT_ON(ret, dev_priv->irq_queue, 3 * DRM_HZ,
+ READ_BREADCRUMB(dev_priv) >= irq_nr);
i915_user_irq_off(dev_priv);
if (ret == DRM_ERR(EBUSY)) {