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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 D8EF4C33CB1 for ; Thu, 16 Jan 2020 12:35:19 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B0A8620748 for ; Thu, 16 Jan 2020 12:35:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B0A8620748 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 669666ECD7; Thu, 16 Jan 2020 12:35:19 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2B5A06ECD7 for ; Thu, 16 Jan 2020 12:35:18 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jan 2020 04:35:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,326,1574150400"; d="scan'208";a="220353611" Received: from gaia.fi.intel.com ([10.237.72.192]) by fmsmga008.fm.intel.com with ESMTP; 16 Jan 2020 04:35:16 -0800 Received: by gaia.fi.intel.com (Postfix, from userid 1000) id F28115C1DEA; Thu, 16 Jan 2020 14:34:39 +0200 (EET) From: Mika Kuoppala To: Chris Wilson , intel-gfx@lists.freedesktop.org In-Reply-To: <20200115175829.2761329-1-chris@chris-wilson.co.uk> References: <20200115175829.2761329-1-chris@chris-wilson.co.uk> Date: Thu, 16 Jan 2020 14:34:39 +0200 Message-ID: <87v9pbpokg.fsf@gaia.fi.intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH] drm/i915/execlists: Leave resetting ring to intel_ring X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matthew Auld Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Chris Wilson writes: > We need to allow concurrent intel_context_unpin, which means avoiding > doing destructive operations like intel_ring_reset(). This was already > fixed for intel_ring_unpin() in commit 0725d9a31869 ("drm/i915/gt: Make > intel_ring_unpin() safe for concurrent pint"), but I overlooked that > execlists_context_unpin() also made the same mistake. > > Reported-by: Matthew Brost > Fixes: 841350223816 ("drm/i915/gt: Drop mutex serialisation between context pin/unpin") > References: 0725d9a31869 ("drm/i915/gt: Make intel_ring_unpin() safe for concurrent pint") > Signed-off-by: Chris Wilson > Cc: Matthew Brost > Cc: Matthew Auld > Cc: Tvrtko Ursulin > --- > drivers/gpu/drm/i915/gt/intel_lrc.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c > index a8fe2f16c910..999fe82190da 100644 > --- a/drivers/gpu/drm/i915/gt/intel_lrc.c > +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c > @@ -2532,7 +2532,6 @@ static void execlists_context_unpin(struct intel_context *ce) > ce->engine); > > i915_gem_object_unpin_map(ce->state->obj); > - intel_ring_reset(ce->ring, ce->ring->tail); It seems we have entered an era where intel_ring_reset() is actually resetting the ring. Long live the engine(s)! Reviewed-by: Mika Kuoppala > } > > static void > -- > 2.25.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx