From patchwork Fri Jan 20 01:06:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sripada, Radhakrishna" X-Patchwork-Id: 13109026 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 A1503C38142 for ; Fri, 20 Jan 2023 01:07:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0C25E10E0DA; Fri, 20 Jan 2023 01:07:34 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1EF6710E0DA for ; Fri, 20 Jan 2023 01:07:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674176852; x=1705712852; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=K8D+T/KOTqU8wIvdSZktqJk62enz/aBTPEwjN4GIhdE=; b=B8a1bhHpQDVKKIguQRsm4RJrgxuSmCTd6qWXT97JDhZfjIkuZKsvn6ye HdfAb22gJJkMd0b+cYDAi1ad8uf8RKRuWnf84ZqlPEYAac4qGxkdCfdsU 8eQtSLIxK3SrZdvxw9BhrXMB5W6dFxlelL7wp1c1Znp0Q86DONxL8QFf9 1/pEMhHeDSgPEw4INO2Zt/uk6Z7WqbAYVBbLv8cGS4wlyE5pwZOdPEs52 +PilpHM9CYWB9oxgsXkpGmRykqtXEf8/mxsGNBwSBDegUzsGWLlbxfNYQ eeP0HIzPEBudGbphFsMivQje2wCei5iFjV/NULuRVGWQU0OwO8eDnDB6v w==; X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="324161366" X-IronPort-AV: E=Sophos;i="5.97,230,1669104000"; d="scan'208";a="324161366" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 17:07:31 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="637976679" X-IronPort-AV: E=Sophos;i="5.97,230,1669104000"; d="scan'208";a="637976679" Received: from invictus.jf.intel.com ([10.165.21.134]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 17:07:31 -0800 From: Radhakrishna Sripada To: intel-gfx@lists.freedesktop.org Date: Thu, 19 Jan 2023 17:06:38 -0800 Message-Id: <20230120010639.3691331-1-radhakrishna.sripada@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 1/2] drm/i915/mtl: Add workarounds Wa_14017066071, Wa_14017654203 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 patch add the workaround to disable Sampler-OOO to avoid hang during a benchmark. Original Author: Madhumitha Tolakanhalli Pradeep Signed-off-by: Radhakrishna Sripada --- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1 + drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h index 4a4bab261e66..27b06ff380a9 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h +++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h @@ -1145,6 +1145,7 @@ #define ENABLE_SMALLPL REG_BIT(15) #define SC_DISABLE_POWER_OPTIMIZATION_EBB REG_BIT(9) #define GEN11_SAMPLER_ENABLE_HEADLESS_MSG REG_BIT(5) +#define MTL_DISABLE_SAMPLER_SC_OOO REG_BIT(3) #define GEN9_HALF_SLICE_CHICKEN7 MCR_REG(0xe194) #define DG2_DISABLE_ROUND_ENABLE_ALLOW_FOR_SSLA REG_BIT(15) diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index 918a271447e2..c52c5f9ad9ce 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -2332,6 +2332,13 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) /* Wa_22014600077 */ wa_mcr_masked_en(wal, GEN10_CACHE_MODE_SS, ENABLE_EU_COUNT_FOR_TDL_FLUSH); + + /* + * Wa_14017066071: mtl-p/m[a0] + * Wa_14017654203: mtl-p/m[a0] + */ + wa_mcr_masked_en(wal, GEN10_SAMPLER_MODE, + MTL_DISABLE_SAMPLER_SC_OOO); } if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) || From patchwork Fri Jan 20 01:06:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sripada, Radhakrishna" X-Patchwork-Id: 13109027 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 B3229C38142 for ; Fri, 20 Jan 2023 01:07:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9ADC510E371; Fri, 20 Jan 2023 01:07:35 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3B68A10E371 for ; Fri, 20 Jan 2023 01:07:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674176852; x=1705712852; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=1pP86+KusGyHK+ybvYbW364xwSE84xit+k1E1CBKEec=; b=k8d2NhlDLX3EBT3cTB7eeUrZBHI+kn5V0vomg4A+3NCs1pKJjkmGENmI 1PsulfExM6LkfzKzYaF296tOqmEOIBDShe46SAw1+U8rgEU/wzkZgFbQs 1IuEiNegoGQImF66bWHwAOVS0H7nryAcFxdCenSNpd29E70HZDnHVtBiw gGcbqsAMK8Nb5HVGDnjWEBruga8jDSGo8fws/JPlEk8AbDCDco7fr0vfj fp6imw4Idbb+JxYlj6jgZXmWqyDf9oGkZZtq7tQ0RauSQO/sy3B4Nohg8 ruOYpZvAJk2xM+nckPFAij1T37vszOrCTSlWUgpUatUl6QUamehH+zRro w==; X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="324161367" X-IronPort-AV: E=Sophos;i="5.97,230,1669104000"; d="scan'208";a="324161367" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 17:07:31 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10595"; a="637976680" X-IronPort-AV: E=Sophos;i="5.97,230,1669104000"; d="scan'208";a="637976680" Received: from invictus.jf.intel.com ([10.165.21.134]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2023 17:07:31 -0800 From: Radhakrishna Sripada To: intel-gfx@lists.freedesktop.org Date: Thu, 19 Jan 2023 17:06:39 -0800 Message-Id: <20230120010639.3691331-2-radhakrishna.sripada@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230120010639.3691331-1-radhakrishna.sripada@intel.com> References: <20230120010639.3691331-1-radhakrishna.sripada@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 2/2] drm/i915/mtl: Add Wa_22015279794 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 patch adds the workaround to disable IC prefetch. Original Author: Madhumitha Tolakanhalli Pradeep Signed-off-by: Radhakrishna Sripada --- drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index c52c5f9ad9ce..47ff4ca2bd61 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -1677,6 +1677,10 @@ xelpg_gt_workarounds_init(struct intel_gt *gt, struct i915_wa_list *wal) IS_MTL_GRAPHICS_STEP(gt->i915, P, STEP_A0, STEP_B0)) wa_mcr_write_clr(wal, SARB_CHICKEN1, COMP_CKN_IN); + /* Wa_22015279794: mtl-p[a0] */ + if (IS_MTL_GRAPHICS_STEP(gt->i915, P, STEP_A0, STEP_B0)) + wa_mcr_masked_en(wal, GEN10_CACHE_MODE_SS, + ENABLE_PREFETCH_INTO_IC); /* * Unlike older platforms, we no longer setup implicit steering here; * all MCR accesses are explicitly steered.