diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2015-06-15 11:59:37 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2015-06-15 13:32:54 +0200 |
| commit | 245ec9d85696c3e539b23e210f248698b478379c (patch) | |
| tree | a28add834c9b242335850ea51d53d0b3617e03d9 /drivers | |
| parent | drm/i915: Always reset vma->ggtt_view.pages cache on unbinding (diff) | |
| download | linux-245ec9d85696c3e539b23e210f248698b478379c.tar.xz linux-245ec9d85696c3e539b23e210f248698b478379c.zip | |
Revert "drm/i915: Don't skip request retirement if the active list is empty"
This reverts commit 0aedb1626566efd72b369c01992ee7413c82a0c5.
I messed things up while applying [1] to drm-intel-fixes. Rectify.
[1] http://mid.gmane.org/1432827156-9605-1-git-send-email-ville.syrjala@linux.intel.com
Fixes: 0aedb1626566 ("drm/i915: Don't skip request retirement if the active list is empty")
Cc: stable@vger.kernel.org
Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index c3806c66650a..2d0995e7afc3 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2656,6 +2656,9 @@ void i915_gem_reset(struct drm_device *dev) void i915_gem_retire_requests_ring(struct intel_engine_cs *ring) { + if (list_empty(&ring->request_list)) + return; + WARN_ON(i915_verify_lists(ring->dev)); /* Retire requests first as we use it above for the early return. |