forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/i915: remove polled wait from throttle

Browse source 
It's about to go away anyway. Just here to help bisection.

Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ben Widawsky 2012-04-26 16:03:04 -07:00 • committed by Daniel Vetter
parent 604dd3ec75
commit 4146b08d76
1 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/gpu/drm/i915/i915_gem.c
View file

@ -2996,12 +2996,9 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file)
if (ret == 0 && atomic_read(&dev_priv->mm.wedged)) if (ret == 0 && atomic_read(&dev_priv->mm.wedged))
ret = -EIO; ret = -EIO;
} else if (wait_for_atomic(i915_seqno_passed(ring->get_seqno(ring), } else
seqno) ||
atomic_read(&dev_priv->mm.wedged), 3000)) {
ret = -EBUSY; ret = -EBUSY;
} }
}
if (ret == 0) if (ret == 0)
queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, 0); queue_delayed_work(dev_priv->wq, &dev_priv->mm.retire_work, 0);