From 14448336dc317e1dd9196b9cb73f4add5665a4c4 Mon Sep 17 00:00:00 2001 From: Ben Widawsky Date: Thu, 26 Apr 2012 16:03:04 -0700 Subject: [PATCH] --- yaml --- r: 307327 b: refs/heads/master c: 4146b08d767a702682bd28e2a21b062983fd937c h: refs/heads/master i: 307325: 3ae469366edac9b5c42f56f9573226ab4543011e 307323: fe91103d21a4d8cde7d4dbfe30be174693000829 307319: c9e332b4cfad56e8b898c5eb1db72b646ac1d7ca 307311: 95719c7d5bb5418f0f8dd63d9ca66c26fc1ccd06 307295: 9a52cc7b1904b10d405332c700867a0ccbca34cf 307263: 2cea056fe08be3a77f62815258cbdeda8515d823 307199: 34b6bccf204df912c58382bf4947d07ae895238c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 89ca34c642a0..6a05776dda28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 604dd3ec75b2488dc81cd25dd85fcea23df25a9e +refs/heads/master: 4146b08d767a702682bd28e2a21b062983fd937c diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index b7a99bfa423d..c19a6214daf7 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem.c @@ -2996,11 +2996,8 @@ i915_gem_ring_throttle(struct drm_device *dev, struct drm_file *file) if (ret == 0 && atomic_read(&dev_priv->mm.wedged)) ret = -EIO; - } else if (wait_for_atomic(i915_seqno_passed(ring->get_seqno(ring), - seqno) || - atomic_read(&dev_priv->mm.wedged), 3000)) { + } else ret = -EBUSY; - } } if (ret == 0)