diff options
author | Ben Widawsky <ben@bwidawsk.net> | 2011-10-17 18:51:54 -0400 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-10-20 18:26:38 -0400 |
commit | f372b85463dac2fc696443d4c5063db2af5dcead (patch) | |
tree | c7db0fe0b11c133ed29499cdb8ae9e500bcb7111 /drivers/gpu/drm/i915/i915_gem.c | |
parent | bab31a224e91bc376a68b4463d6d06cb1e4ce623 (diff) |
drm/i915: Remove early exit on i915_gpu_idle
[Description from: Daniel Vetter]
I've just discussed this quickly with Chris on irc and it's probably
best to just kill the list_empty early bailout. gpu_idle isn't a
fastpath, so who cares. One candidate where we emit commands to the ring
without adding anything onto these lists is e.g. pageflip. There are
probably more.
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 0d0ed77bbe28..6651c36b6e8a 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
@@ -2193,14 +2193,8 @@ int | |||
2193 | i915_gpu_idle(struct drm_device *dev) | 2193 | i915_gpu_idle(struct drm_device *dev) |
2194 | { | 2194 | { |
2195 | drm_i915_private_t *dev_priv = dev->dev_private; | 2195 | drm_i915_private_t *dev_priv = dev->dev_private; |
2196 | bool lists_empty; | ||
2197 | int ret, i; | 2196 | int ret, i; |
2198 | 2197 | ||
2199 | lists_empty = (list_empty(&dev_priv->mm.flushing_list) && | ||
2200 | list_empty(&dev_priv->mm.active_list)); | ||
2201 | if (lists_empty) | ||
2202 | return 0; | ||
2203 | |||
2204 | /* Flush everything onto the inactive list. */ | 2198 | /* Flush everything onto the inactive list. */ |
2205 | for (i = 0; i < I915_NUM_RINGS; i++) { | 2199 | for (i = 0; i < I915_NUM_RINGS; i++) { |
2206 | ret = i915_ring_idle(&dev_priv->ring[i]); | 2200 | ret = i915_ring_idle(&dev_priv->ring[i]); |