From: Ville Syrjälä Date: Thu, 28 May 2015 15:32:36 +0000 (+0300) Subject: drm/i915: Don't skip request retirement if the active list is empty X-Git-Tag: v3.4.109~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67e446d9b790df4c0c5c53619a208c2826b1ec64;p=thirdparty%2Fkernel%2Fstable.git drm/i915: Don't skip request retirement if the active list is empty commit 0aedb1626566efd72b369c01992ee7413c82a0c5 upstream. Apparently we can have requests even if though the active list is empty, so do the request retirement regardless of whether there's anything on the active list. The way it happened here is that during suspend intel_ring_idle() notices the olr hanging around and then proceeds to get rid of it by adding a request. However since there was nothing on the active lists i915_gem_retire_requests() didn't clean those up, and so the idle work never runs, and we leave the GPU "busy" during suspend resulting in a WARN later. Signed-off-by: Ville Syrjälä Reviewed-by: Chris Wilson Signed-off-by: Jani Nikula [lizf: Backported to 3.4: adjust context] Signed-off-by: Zefan Li --- diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index b1f1d105e8c72..e1c744d7370ae 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1779,9 +1779,6 @@ i915_gem_retire_requests_ring(struct intel_ring_buffer *ring) uint32_t seqno; int i; - if (list_empty(&ring->request_list)) - return; - WARN_ON(i915_verify_lists(ring->dev)); seqno = ring->get_seqno(ring);