From patchwork Thu Mar 16 20:41:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sripada, Radhakrishna" X-Patchwork-Id: 13178309 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 6267BC6FD1F for ; Thu, 16 Mar 2023 20:42:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D24B210E0DF; Thu, 16 Mar 2023 20:42:21 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id C47BB10E0DF for ; Thu, 16 Mar 2023 20:42:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678999340; x=1710535340; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=xARXbDMYa4otFoc9jkTC0292vf7hQm5MCV/Eo8VQ1n8=; b=hudKNu0uiSyHUzONA8bZIsd8O2DXFs2fpySmVQKRELD+W36O4E4J2Fbr hrADD+ogLgBPN2Srr1c15IrOpr4teQrco4AW6eYkSLU/vYRsfrbpSKT0H KIVhsKDWk92w4hzoKXgqjoYKV7OlGMaS/zRf3vfYqYDpJRqplk8+YW+1N pKZy0u/Dp9v0nY8CC+cCsPid/06IQrIKDtlRn6NmzSoktAlYcIpbt09eR 6laOgpMvbxrT1HQhrlpxmyp93DwrsLT5E9u8McccxihdV8ekDgkTEMIXm ASANUwdYE5/niTLvKrJtgfKC8Yx1VfMNqbGWrtW875HlxMkKbxGZWjAX2 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10651"; a="335593865" X-IronPort-AV: E=Sophos;i="5.98,265,1673942400"; d="scan'208";a="335593865" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2023 13:42:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10651"; a="854197969" X-IronPort-AV: E=Sophos;i="5.98,265,1673942400"; d="scan'208";a="854197969" Received: from invictus.jf.intel.com ([10.165.21.134]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2023 13:42:19 -0700 From: Radhakrishna Sripada To: intel-gfx@lists.freedesktop.org Date: Thu, 16 Mar 2023 13:41:43 -0700 Message-Id: <20230316204143.1768749-1-radhakrishna.sripada@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230316202549.1764024-4-radhakrishna.sripada@intel.com> References: <20230316202549.1764024-4-radhakrishna.sripada@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH dii-client v1.1] drm/i915/mtl: Extend Wa_22011802037 to MTL A-step 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" From: Madhumitha Tolakanahalli Pradeep Wa_22011802037 was being applied to all graphics_ver 11 & 12. This patch updates the if statement to apply the W/A to right platforms and extends it to MTL-M:A0. v1.1: Fix checkpatch warning. Signed-off-by: Madhumitha Tolakanahalli Pradeep Signed-off-by: Radhakrishna Sripada --- drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 4 +++- 1 file changed, 3 insertions(+), 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 88e881b100cf..a099406dcc38 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -1629,7 +1629,9 @@ static void guc_reset_state(struct intel_context *ce, u32 head, bool scrub) static void guc_engine_reset_prepare(struct intel_engine_cs *engine) { - if (!IS_GRAPHICS_VER(engine->i915, 11, 12)) + if (!(IS_MTL_GRAPHICS_STEP(engine->i915, M, STEP_A0, STEP_B0) || + (GRAPHICS_VER(engine->i915) >= 11 && + GRAPHICS_VER_FULL(engine->i915) < IP_VER(12, 70)))) return; intel_engine_stop_cs(engine);