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 6F5E0C3DA4A for ; Fri, 9 Aug 2024 09:22:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 00CD910E891; Fri, 9 Aug 2024 09:22:51 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="ZFlOkSck"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5703410E88F; Fri, 9 Aug 2024 09:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1723195369; x=1754731369; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to; bh=bYGndcNnW1Vba4fNuZLi9vqUiGdG9Cad+lm8zp8Ojcs=; b=ZFlOkSck7xzNTACNM/1Smie+u3A5hp/+Py2bZ1uoVvZconczeemPlhM+ QYP5pcf/9WB/tCAkf41FkQc4j3LKQg/agbl/KKKf4q130E88/1SXlBE6J MF/Bi29zUZ1b4uByQVhoXHc7zb878KLU978ObOcgo4yPVpOMWNxfA3vpL q0rfse2RqwHyN/EMHsyCYcgFp0IY3HVm0/G02bVxFYlsF9D5VnF0sTXYo gqEdICzeMzFwl/A5qUR6Wb1kgkZ7Xft74Bzc6F0kuBeYMqXLAJDdj9UhI C8PwnnR+FYmDQxa4P7Qu5s0fYcLc5FesH9HOjWPvcZXyfM4tauZ3KjmvD w==; X-CSE-ConnectionGUID: sTJ1OIgMR6iT16Lh4uWYLQ== X-CSE-MsgGUID: 5KIpv2/NRGy2+xjwLNy+5Q== X-IronPort-AV: E=McAfee;i="6700,10204,11158"; a="21486411" X-IronPort-AV: E=Sophos;i="6.09,275,1716274800"; d="scan'208,217";a="21486411" Received: from fmviesa010.fm.intel.com ([10.60.135.150]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Aug 2024 02:22:48 -0700 X-CSE-ConnectionGUID: tbTCISUSRQSpZyPvqbWXgQ== X-CSE-MsgGUID: +skD7IZZQK+hCRArOt9lPA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,275,1716274800"; d="scan'208,217";a="57594547" Received: from nirmoyda-mobl.ger.corp.intel.com (HELO [10.245.146.117]) ([10.245.146.117]) by fmviesa010-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Aug 2024 02:22:45 -0700 Content-Type: multipart/alternative; boundary="------------30rVFzWDHg0gF4dmqBlse02w" Message-ID: <58ed26e4-71bc-4182-879c-eb33d9329500@linux.intel.com> Date: Fri, 9 Aug 2024 11:22:32 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] drm/i915/guc: Fix missing enable of Wa_14019159160 on ARL To: John.C.Harrison@Intel.com, Intel-GFX@Lists.FreeDesktop.Org Cc: DRI-Devel@Lists.FreeDesktop.Org, Vinay Belgaumkar , Daniele Ceraolo Spurio , Andi Shyti , Lucas De Marchi , Rodrigo Vivi , Matt Roper , Jonathan Cavitt , Nirmoy Das , Shuicheng Lin References: <20240809000646.1747507-1-John.C.Harrison@Intel.com> Content-Language: en-US From: Nirmoy Das In-Reply-To: <20240809000646.1747507-1-John.C.Harrison@Intel.com> 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" This is a multi-part message in MIME format. --------------30rVFzWDHg0gF4dmqBlse02w Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/9/2024 2:06 AM, John.C.Harrison@Intel.com wrote: > From: John Harrison > > The previous update to enable the workaround on ARL only changed two > out of three places where the w/a needs to be enabled. That meant the > GuC side was operational but not the KMD side. And as the KMD side is > the trigger, it meant the w/a was not actually active. So fix that. > > Fixes: 104bcfae57d8 ("drm/i915/arl: Enable Wa_14019159160 for ARL") > Cc: John Harrison > Cc: Vinay Belgaumkar > Cc: Daniele Ceraolo Spurio > Cc: Andi Shyti > Cc: Lucas De Marchi > Cc: Rodrigo Vivi > Cc: Matt Roper > Cc: Jonathan Cavitt > Cc: Nirmoy Das > Cc: Shuicheng Lin > Signed-off-by: John Harrison Reviewed-by: Nirmoy Das > --- > drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > index 9400d0eb682b2..3e1c3bc56daf2 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > @@ -4506,7 +4506,7 @@ static void guc_default_vfuncs(struct intel_engine_cs *engine) > /* Wa_16019325821 */ > /* Wa_14019159160 */ > if ((engine->class == COMPUTE_CLASS || engine->class == RENDER_CLASS) && > - IS_GFX_GT_IP_RANGE(engine->gt, IP_VER(12, 70), IP_VER(12, 71))) > + IS_GFX_GT_IP_RANGE(engine->gt, IP_VER(12, 70), IP_VER(12, 74))) > engine->flags |= I915_ENGINE_USES_WA_HOLD_SWITCHOUT; > > /* --------------30rVFzWDHg0gF4dmqBlse02w Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit


On 8/9/2024 2:06 AM, John.C.Harrison@Intel.com wrote:
From: John Harrison <John.C.Harrison@Intel.com>

The previous update to enable the workaround on ARL only changed two
out of three places where the w/a needs to be enabled. That meant the
GuC side was operational but not the KMD side. And as the KMD side is
the trigger, it meant the w/a was not actually active. So fix that.

Fixes: 104bcfae57d8 ("drm/i915/arl: Enable Wa_14019159160 for ARL")
Cc: John Harrison <John.C.Harrison@Intel.com>
Cc: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Andi Shyti <andi.shyti@linux.intel.com>
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Jonathan Cavitt <jonathan.cavitt@intel.com>
Cc: Nirmoy Das <nirmoy.das@intel.com>
Cc: Shuicheng Lin <shuicheng.lin@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com> 
---
 drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index 9400d0eb682b2..3e1c3bc56daf2 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -4506,7 +4506,7 @@ static void guc_default_vfuncs(struct intel_engine_cs *engine)
 	/* Wa_16019325821 */
 	/* Wa_14019159160 */
 	if ((engine->class == COMPUTE_CLASS || engine->class == RENDER_CLASS) &&
-	    IS_GFX_GT_IP_RANGE(engine->gt, IP_VER(12, 70), IP_VER(12, 71)))
+	    IS_GFX_GT_IP_RANGE(engine->gt, IP_VER(12, 70), IP_VER(12, 74)))
 		engine->flags |= I915_ENGINE_USES_WA_HOLD_SWITCHOUT;
 
 	/*
--------------30rVFzWDHg0gF4dmqBlse02w--