|
@@ -1293,12 +1293,12 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
|
|
if (master_priv->sarea_priv)
|
|
if (master_priv->sarea_priv)
|
|
master_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
|
|
master_priv->sarea_priv->perf_boxes |= I915_BOX_WAIT;
|
|
|
|
|
|
- ret = -ENODEV;
|
|
|
|
if (ring->irq_get(ring)) {
|
|
if (ring->irq_get(ring)) {
|
|
DRM_WAIT_ON(ret, ring->irq_queue, 3 * DRM_HZ,
|
|
DRM_WAIT_ON(ret, ring->irq_queue, 3 * DRM_HZ,
|
|
READ_BREADCRUMB(dev_priv) >= irq_nr);
|
|
READ_BREADCRUMB(dev_priv) >= irq_nr);
|
|
ring->irq_put(ring);
|
|
ring->irq_put(ring);
|
|
- }
|
|
|
|
|
|
+ } else if (wait_for(READ_BREADCRUMB(dev_priv) >= irq_nr, 3000))
|
|
|
|
+ ret = -EBUSY;
|
|
|
|
|
|
if (ret == -EBUSY) {
|
|
if (ret == -EBUSY) {
|
|
DRM_ERROR("EBUSY -- rec: %d emitted: %d\n",
|
|
DRM_ERROR("EBUSY -- rec: %d emitted: %d\n",
|