diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-08-07 10:05:39 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-08-08 11:44:01 -0400 |
commit | 403bdd10c815029694046adf5ffde0577cbd2866 (patch) | |
tree | c24e5f95b162251c4414d8e9e0aac9463d952c01 /drivers/gpu/drm/i915/intel_ringbuffer.c | |
parent | 01e184cc85d4516cab0ecea7c2c43a2dd3ad432b (diff) |
drm/i915: No busy-loop wait_for in the ring init code
Doing a 1s wait (tops) with the cpu is a bit excessive. Tune it down
like everything else in that code.
v2: Also insert the missing space Chris spotted.
Cc: Naresh Kumar Kachhi <naresh.kumar.kachhi@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 16371a444426..117543e58d48 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c | |||
@@ -476,8 +476,8 @@ static bool stop_ring(struct intel_engine_cs *ring) | |||
476 | 476 | ||
477 | if (!IS_GEN2(ring->dev)) { | 477 | if (!IS_GEN2(ring->dev)) { |
478 | I915_WRITE_MODE(ring, _MASKED_BIT_ENABLE(STOP_RING)); | 478 | I915_WRITE_MODE(ring, _MASKED_BIT_ENABLE(STOP_RING)); |
479 | if (wait_for_atomic((I915_READ_MODE(ring) & MODE_IDLE) != 0, 1000)) { | 479 | if (wait_for((I915_READ_MODE(ring) & MODE_IDLE) != 0, 1000)) { |
480 | DRM_ERROR("%s :timed out trying to stop ring\n", ring->name); | 480 | DRM_ERROR("%s : timed out trying to stop ring\n", ring->name); |
481 | return false; | 481 | return false; |
482 | } | 482 | } |
483 | } | 483 | } |