Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753588AbbFWH0x (ORCPT ); Tue, 23 Jun 2015 03:26:53 -0400 Received: from mga11.intel.com ([192.55.52.93]:24299 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751669AbbFWH0q convert rfc822-to-8bit (ORCPT ); Tue, 23 Jun 2015 03:26:46 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,664,1427785200"; d="scan'208";a="748683336" From: Jani Nikula To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ville =?utf-8?B?U3lyasOkbMOk?= , Chris Wilson Subject: Re: [PATCH 4.0 077/105] drm/i915: Dont skip request retirement if the active list is empty In-Reply-To: <20150619203600.449494173@linuxfoundation.org> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20150619203558.187802739@linuxfoundation.org> <20150619203600.449494173@linuxfoundation.org> User-Agent: Notmuch/0.19+112~g77230b0 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Tue, 23 Jun 2015 10:29:13 +0300 Message-ID: <87h9py288m.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2462 Lines: 74 On Fri, 19 Jun 2015, Greg Kroah-Hartman wrote: > 4.0-stable review patch. If anyone has any objections, please let me know. The commit to be backported is already reverted in upstream, and I just got an email from you backporting the revert as well... would be best to *not* backport either of these: commit 0aedb1626566efd72b369c01992ee7413c82a0c5 Author: Ville Syrjälä Date: Thu May 28 18:32:36 2015 +0300 drm/i915: Don't skip request retirement if the active list is empty commit 245ec9d85696c3e539b23e210f248698b478379c Author: Jani Nikula Date: Mon Jun 15 12:59:37 2015 +0300 Revert "drm/i915: Don't skip request retirement if the active list is empty" I only marked the revert cc: stable because the original was too. BR, Jani. > > ------------------ > > From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= > > 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 > Signed-off-by: Greg Kroah-Hartman > > --- > drivers/gpu/drm/i915/i915_gem.c | 3 --- > 1 file changed, 3 deletions(-) > > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -2732,9 +2732,6 @@ void i915_gem_reset(struct drm_device *d > 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. > > -- Jani Nikula, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/