From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB9D5C433FE for ; Fri, 4 Dec 2020 15:08:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8FEA322B40 for ; Fri, 4 Dec 2020 15:08:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726635AbgLDPIG (ORCPT ); Fri, 4 Dec 2020 10:08:06 -0500 Received: from mga09.intel.com ([134.134.136.24]:37581 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725923AbgLDPIG (ORCPT ); Fri, 4 Dec 2020 10:08:06 -0500 IronPort-SDR: Qj36wICPLc7mAUWAj6yo3Tl0vDSRUp2xTj+QrMSbDsqmo5i9Mp7M19Kwk72spizMVJ/748l/Ka srp5FU0Rex2g== X-IronPort-AV: E=McAfee;i="6000,8403,9824"; a="173543044" X-IronPort-AV: E=Sophos;i="5.78,393,1599548400"; d="scan'208";a="173543044" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2020 07:06:11 -0800 IronPort-SDR: 0KzdOnQ7FIoGWUkp9EIe1QfBgOSIa8vPp30LlDyfNEKYpdmmelWBtA9Hq3PbjNNhite2sfiC6+ v0oKmWMif8JA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,393,1599548400"; d="scan'208";a="346630844" Received: from gaia.fi.intel.com ([10.237.72.192]) by orsmga002.jf.intel.com with ESMTP; 04 Dec 2020 07:06:09 -0800 Received: by gaia.fi.intel.com (Postfix, from userid 1000) id D2B6E5C2069; Fri, 4 Dec 2020 17:03:57 +0200 (EET) From: Mika Kuoppala To: Chris Wilson , intel-gfx@lists.freedesktop.org Cc: Chris Wilson , stable@vger.kernel.org Subject: Re: [Intel-gfx] [PATCH 02/24] drm/i915/gt: Ignore repeated attempts to suspend request flow across reset In-Reply-To: <20201204140315.24341-2-chris@chris-wilson.co.uk> References: <20201204140315.24341-1-chris@chris-wilson.co.uk> <20201204140315.24341-2-chris@chris-wilson.co.uk> Date: Fri, 04 Dec 2020 17:03:57 +0200 Message-ID: <877dpx395u.fsf@gaia.fi.intel.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Chris Wilson writes: > Before reseting the engine, we suspend the execution of the guilty > request, so that we can continue execution with a new context while we > slowly compress the captured error state for the guilty context. However, > if the reset fails, we will promptly attempt to reset the same request > again, and discover the ongoing capture. Ignore the second attempt to > suspend and capture the same request. > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/1168 > Fixes: 32ff621fd744 ("drm/i915/gt: Allow temporary suspension of inflight requests") > Signed-off-by: Chris Wilson > Cc: # v5.7+ Reviewed-by: Mika Kuoppala > --- > drivers/gpu/drm/i915/gt/intel_lrc.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c > index 43703efb36d1..1d209a8a95e8 100644 > --- a/drivers/gpu/drm/i915/gt/intel_lrc.c > +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c > @@ -2823,6 +2823,9 @@ static void __execlists_hold(struct i915_request *rq) > static bool execlists_hold(struct intel_engine_cs *engine, > struct i915_request *rq) > { > + if (i915_request_on_hold(rq)) > + return false; > + > spin_lock_irq(&engine->active.lock); > > if (i915_request_completed(rq)) { /* too late! */ > -- > 2.20.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx