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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id EC9D9CCF9E7 for ; Wed, 25 Sep 2024 18:38:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6869E10E069; Wed, 25 Sep 2024 18:38:32 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="OIr9/F1k"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id DD9EE10E069 for ; Wed, 25 Sep 2024 18:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727289511; x=1758825511; h=date:message-id:from:to:subject:in-reply-to:references: mime-version:content-transfer-encoding; bh=ZERoiHKUrqfRusREws0MJHp1enYwxIK8FpZEQQbSJo0=; b=OIr9/F1knN1ZEaScuwJxzL7dvmsFqz9dg7Ju7ntJpNBPq/D57mzmVp/3 Bb6n0lt8It5jejmz5yKH8JMGhU4uMtJg1+RzQGpw84tCWkQ7qLm/0O7ME M3jgnFT04yDPkSqn1+yEd5PfbXxh4FiEpZldLbQWE3iH5qZ7jJ4lblE54 UD9zpQ/9YxcNO8EUA6UPGMCYg2ikGR7duUEE3KiOFtj22nX26s2ClB5Nk cE5RdpcOsow5lo8W9x2E7HtBa+9/Rx4yLOeifyQdQiMXblyxgzWGDMZTw nJ64oKpuFh7ncjr86IgjncdeFyODY8F1VS3QtkmFZ4QBNFAh6Iri3jagB A==; X-CSE-ConnectionGUID: ny8qEoWRT8aCIcvpWV132A== X-CSE-MsgGUID: R/a5SkIcSCCU8tEYALuoJA== X-IronPort-AV: E=McAfee;i="6700,10204,11206"; a="26222233" X-IronPort-AV: E=Sophos;i="6.10,258,1719903600"; d="scan'208";a="26222233" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2024 11:38:30 -0700 X-CSE-ConnectionGUID: H2UaMvyLSBy9rx4kKLnj3Q== X-CSE-MsgGUID: MF/rkz9URcKCIuzNkfaMvA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,258,1719903600"; d="scan'208";a="76793435" Received: from orsosgc001.jf.intel.com (HELO orsosgc001.intel.com) ([10.165.21.138]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Sep 2024 11:38:30 -0700 Date: Wed, 25 Sep 2024 11:38:30 -0700 Message-ID: <85h6a3fujd.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: intel-xe@lists.freedesktop.org Subject: Re: [PATCH] drm/xe/oa: Don't reset OAC_CONTEXT_ENABLE on OA stream close In-Reply-To: <20240924213713.3497992-1-ashutosh.dixit@intel.com> References: <20240924213713.3497992-1-ashutosh.dixit@intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/28.2 (x86_64-redhat-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Tue, 24 Sep 2024 14:37:13 -0700, Ashutosh Dixit wrote: > > From: Jos=E9 Roberto de Souza > > Mesa testing on Xe2+ revealed that when OA metrics are collected for an > exec_queue, after the OA stream is closed, future batch buffers submitted > on that exec_queue do not complete. Not resetting OAC_CONTEXT_ENABLE on OA > stream close resolves these hangs and should not have any adverse effects. > > v2: Make the change that we don't reset the bit clearer (Ashutosh) > Also make the same fix for OAC as OAR (Ashutosh) Reviewed-by: Ashutosh Dixit > > Bspec: 60314 > Fixes: 2f4a730fcd2d ("drm/xe/oa: Add OAR support") > Fixes: 14e077f8006d ("drm/xe/oa: Add OAC support") > Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2821 > Signed-off-by: Jos=E9 Roberto de Souza > Signed-off-by: Ashutosh Dixit > Cc: stable@vger.kernel.org > --- > drivers/gpu/drm/xe/xe_oa.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c > index 6d17f89a132d2..30bfba6c744ca 100644 > --- a/drivers/gpu/drm/xe/xe_oa.c > +++ b/drivers/gpu/drm/xe/xe_oa.c > @@ -765,8 +765,7 @@ static int xe_oa_configure_oar_context(struct xe_oa_s= tream *stream, bool enable) > { > RING_CONTEXT_CONTROL(stream->hwe->mmio_base), > regs_offset + CTX_CONTEXT_CONTROL, > - _MASKED_FIELD(CTX_CTRL_OAC_CONTEXT_ENABLE, > - enable ? CTX_CTRL_OAC_CONTEXT_ENABLE : 0) > + _MASKED_BIT_ENABLE(CTX_CTRL_OAC_CONTEXT_ENABLE), > }, > }; > struct xe_oa_reg reg_lri =3D { OAR_OACONTROL, oacontrol }; > @@ -798,10 +797,8 @@ static int xe_oa_configure_oac_context(struct xe_oa_= stream *stream, bool enable) > { > RING_CONTEXT_CONTROL(stream->hwe->mmio_base), > regs_offset + CTX_CONTEXT_CONTROL, > - _MASKED_FIELD(CTX_CTRL_OAC_CONTEXT_ENABLE, > - enable ? CTX_CTRL_OAC_CONTEXT_ENABLE : 0) | > - _MASKED_FIELD(CTX_CTRL_RUN_ALONE, > - enable ? CTX_CTRL_RUN_ALONE : 0), > + _MASKED_BIT_ENABLE(CTX_CTRL_OAC_CONTEXT_ENABLE) | > + _MASKED_FIELD(CTX_CTRL_RUN_ALONE, enable ? CTX_CTRL_RUN_ALONE : 0), > }, > }; > struct xe_oa_reg reg_lri =3D { OAC_OACONTROL, oacontrol }; > -- > 2.41.0 >