From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] Revert "drm/i915: Don't skip request retirement if the active list is empty" Date: Mon, 15 Jun 2015 14:35:35 +0300 Message-ID: <87wpz55hmg.fsf@intel.com> References: <1434362377-17489-1-git-send-email-jani.nikula@intel.com> <20150615103704.GH5176@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <20150615103704.GH5176@intel.com> Sender: stable-owner@vger.kernel.org To: Ville =?utf-8?B?U3lyasOkbMOk?= Cc: intel-gfx@lists.freedesktop.org, stable@vger.kernel.org List-Id: intel-gfx@lists.freedesktop.org On Mon, 15 Jun 2015, Ville Syrj=C3=A4l=C3=A4 wrote: > On Mon, Jun 15, 2015 at 12:59:37PM +0300, Jani Nikula wrote: >> This reverts commit 0aedb1626566efd72b369c01992ee7413c82a0c5. >>=20 >> I messed things up while applying [1] to drm-intel-fixes. Rectify. >>=20 >> [1]=C2=A0http://mid.gmane.org/1432827156-9605-1-git-send-email-ville= =2Esyrjala@linux.intel.com >>=20 >> Fixes: 0aedb1626566 ("drm/i915: Don't skip request retirement if the= active list is empty") >> Cc: stable@vger.kernel.org >> Signed-off-by: Jani Nikula >> > > Acked-by: Ville Syrj=C3=A4l=C3=A4 Pushed to drm-intel-fixes. BR, Jani. > > However this leaves us with an early bailout if request_list is empty= =2E > Hopefully that won't cause other issues. I suppose we shouldn't have > stuff on the active_list w/o any pending requests. > >> --- >>=20 >> Note to stable team: please do *not* backport >>=20 >> commit 0aedb1626566efd72b369c01992ee7413c82a0c5 >> Author: Ville Syrj=C3=A4l=C3=A4 >> Date: Thu May 28 18:32:36 2015 +0300 >>=20 >> drm/i915: Don't skip request retirement if the active list is em= pty >>=20 >> but if you did, please backport this revert as well. >>=20 >> Thanks, and sorry. >>=20 >> BR, >> Jani. >> --- >> drivers/gpu/drm/i915/i915_gem.c | 3 +++ >> 1 file changed, 3 insertions(+) >>=20 >> 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)); >> =20 >> /* Retire requests first as we use it above for the early return. >> --=20 >> 2.1.4 > > --=20 > Ville Syrj=C3=A4l=C3=A4 > Intel OTC --=20 Jani Nikula, Intel Open Source Technology Center