From patchwork Wed May 10 22:35:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sripada, Radhakrishna" X-Patchwork-Id: 13237319 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 2494CC77B7C for ; Wed, 10 May 2023 22:37:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 96E7C10E0EA; Wed, 10 May 2023 22:37:17 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id AF00810E0EA for ; Wed, 10 May 2023 22:37:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683758236; x=1715294236; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=PRki2V4UFWCRdPI8RU0NezCR5Kk65ZhYUR04nD/n6TI=; b=Aj0h5cm8KxCgfat6UFnBZ/m0UcyjSfPkPm0I4RPyMQ/ZakXxccaL5SRM jdBpXke13Tm9qYzBz3KI5DkAiodnuupWgjVpl1WWdEQpJDf+IqIwrjjX6 eqGY5W5beVVCDRMUHRRzk20RfCzY6SV/bSICv8ZLaWUjEsu9thKFmCjoN +TYJj7pvI5SboAR7KDUhNhKZK79ccXGRmMy5teHoBP8PvM1soC7zIuVae 8xoxFxS462asHbVB5FNTEvPGvIFTxBiBmzfPdpXgJa5hXFcgrYu8LgxQU S/00vS90I8ae0E6QmpPc2BCMTOL7s8JZc37nnM0VWwbUah+yyaxKVabhE g==; X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="339595354" X-IronPort-AV: E=Sophos;i="5.99,265,1677571200"; d="scan'208";a="339595354" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2023 15:37:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="732317521" X-IronPort-AV: E=Sophos;i="5.99,265,1677571200"; d="scan'208";a="732317521" Received: from invictus.jf.intel.com ([10.165.21.201]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2023 15:37:15 -0700 From: Radhakrishna Sripada To: intel-gfx@lists.freedesktop.org Date: Wed, 10 May 2023 15:35:51 -0700 Message-Id: <20230510223552.89656-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: Extend Wa_16014892111 to MTL 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: Matt Roper Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" The dg2 workaround which is used for performance tuning is needed for Meteorlake. Bspec: 68331 Cc: Matt Roper Cc: Gustavo Sousa Signed-off-by: Radhakrishna Sripada Reviewed-by: Gustavo Sousa --- drivers/gpu/drm/i915/gt/intel_lrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c index 81a96c52a92b..78ec350188b6 100644 --- a/drivers/gpu/drm/i915/gt/intel_lrc.c +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c @@ -1370,7 +1370,7 @@ gen12_emit_indirect_ctx_rcs(const struct intel_context *ce, u32 *cs) cs, GEN12_GFX_CCS_AUX_NV); /* Wa_16014892111 */ - if (IS_DG2(ce->engine->i915)) + if (IS_DG2(ce->engine->i915) || IS_METEORLAKE(ce->engine->i915)) cs = dg2_emit_draw_watermark_setting(cs); return cs; From patchwork Wed May 10 22:35:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sripada, Radhakrishna" X-Patchwork-Id: 13237318 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 2C6C1C77B7D for ; Wed, 10 May 2023 22:37:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9704A10E0F4; Wed, 10 May 2023 22:37:19 +0000 (UTC) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id CC8AB10E0F4 for ; Wed, 10 May 2023 22:37:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683758236; x=1715294236; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=yjWl88TEbyfYn1R5cT15/G5yTlQFWC18x59DIx7LLck=; b=Z/4zvT04CO/J0lNmH94opASsMG3tbnp8yg5n9FphdA0lgYcNIOEXLeJu CpQjcmXP4gfS90314GLD2esIQ/6ThyDAAm7xZy9KmYnspxpVZD3Opaswc B8hef8ejMiY9aCFRZgCkY1vDXem+x2uRudIWkMbIM44IXC/IemI2jFVFr RhZNngbz1QoMNDf81W3s/beRPQThjnJXEDoPVqwRnJfsxZZLzVWTz5z4A PWrE+i7/RxPWIEo/fDGL20fwdGsnDai0NM7bPCYX+Uft7PDCS+pQUn9gF nQBfiUJoHOTJWyWHLXcsX9T+pWF0+/EMB0E4JkgpYBKZOEmSv2fZ4NXCU A==; X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="339595356" X-IronPort-AV: E=Sophos;i="5.99,265,1677571200"; d="scan'208";a="339595356" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2023 15:37:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10706"; a="732317523" X-IronPort-AV: E=Sophos;i="5.99,265,1677571200"; d="scan'208";a="732317523" Received: from invictus.jf.intel.com ([10.165.21.201]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 May 2023 15:37:15 -0700 From: Radhakrishna Sripada To: intel-gfx@lists.freedesktop.org Date: Wed, 10 May 2023 15:35:52 -0700 Message-Id: <20230510223552.89656-2-radhakrishna.sripada@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230510223552.89656-1-radhakrishna.sripada@intel.com> References: <20230510223552.89656-1-radhakrishna.sripada@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 2/2] drm/i915/mtl: Add MTL performance tuning changes 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: Matt Roper Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" MTL reuses the tuning parameters for DG2. Extend the dg2 performance tuning parameters to MTL. Bspec: 68331 Cc: Matt Roper Cc: Gustavo Sousa Signed-off-by: Radhakrishna Sripada Reviewed-by: Gustavo Sousa --- drivers/gpu/drm/i915/gt/intel_workarounds.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index 786349e95487..b222a3d367c9 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -817,6 +817,8 @@ static void mtl_ctx_workarounds_init(struct intel_engine_cs *engine, { struct drm_i915_private *i915 = engine->i915; + dg2_ctx_gt_tuning_init(engine, wal); + if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) || IS_MTL_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0)) { /* Wa_14014947963 */ @@ -1754,7 +1756,7 @@ static void gt_tuning_settings(struct intel_gt *gt, struct i915_wa_list *wal) wa_mcr_masked_en(wal, XEHPC_LNCFMISCCFGREG0, XEHPC_HOSTCACHEEN); } - if (IS_DG2(gt->i915)) { + if (IS_DG2(gt->i915) || IS_METEORLAKE(gt->i915)) { wa_mcr_write_or(wal, XEHP_L3SCQREG7, BLEND_FILL_CACHING_OPT_DIS); wa_mcr_write_or(wal, XEHP_SQCM, EN_32B_ACCESS); } @@ -2944,7 +2946,7 @@ static void add_render_compute_tuning_settings(struct drm_i915_private *i915, struct i915_wa_list *wal) { - if (IS_DG2(i915)) + if (IS_DG2(i915) || IS_METEORLAKE(i915)) wa_mcr_write_clr_set(wal, RT_CTRL, STACKID_CTRL, STACKID_CTRL_512); /*