From patchwork Mon Oct 23 07:41:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 13432472 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 140F1C001E0 for ; Mon, 23 Oct 2023 07:41:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 91CAF10E161; Mon, 23 Oct 2023 07:41:53 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C0C910E15D for ; Mon, 23 Oct 2023 07:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1698046908; x=1729582908; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=a8dhYNib41lXDgcVFkweQNqAZTcg7pwhGP5KdQD2Wfc=; b=L3f5SHci4+0DQHGz9p/dN5B+tbJh8jNSh7vjRzawc7u6AYjh1UFPhndC cUnGJgTBt/5UJMX3JWXrvx4lXFiLpNr6mjYgFhe6ceHjdS4qbFHuLXm4X vLOWI9z/6y7QX6+sId0BBfs+26Q9jFe8Hz+PGHXElrNIEEhYOswh4jhuM KmQ1q1VDIfTMZjgrPwkYTGZuHSoQ5/zigo/lqQnVvPsL4Hc23VIM2PYMN OOtNWCexZM3W6d+jAXbA4jcvXPQ/uz3MWWXX/XJHP7pvhRyjD9IZBMWQV dfiChNoeazVzb13Sjkr+YeGGniwO+/p62y+zr+EiMCDwkqPedB3Nl9HfB g==; X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="473000649" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="473000649" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Oct 2023 00:41:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10871"; a="848716422" X-IronPort-AV: E=Sophos;i="6.03,244,1694761200"; d="scan'208";a="848716422" Received: from lab-ah.igk.intel.com ([10.102.138.202]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Oct 2023 00:41:46 -0700 From: Andrzej Hajda Date: Mon, 23 Oct 2023 09:41:22 +0200 MIME-Version: 1.0 Message-Id: <20231023-wabb-v3-4-1a4fbc632440@intel.com> References: <20231023-wabb-v3-0-1a4fbc632440@intel.com> In-Reply-To: <20231023-wabb-v3-0-1a4fbc632440@intel.com> To: intel-gfx@lists.freedesktop.org X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1881; i=andrzej.hajda@intel.com; h=from:subject:message-id; bh=nDRbyhSJhTAjBI8lxwyQRTPCFf4uI6ppQz63RvljIaQ=; b=owEB7QES/pANAwAKASNispPeEP3XAcsmYgBlNiOzSPbQK6Wgf8CPd9lI/DHW9rfeIzSJZgHycHM0 s4uT6HKJAbMEAAEKAB0WIQT8qEQxNN2/XeF/A00jYrKT3hD91wUCZTYjswAKCRAjYrKT3hD919HlC/ 9m1wh33vI7kKSs9yhmZKcp+R/PGSscpr0a/t6XO8MbupBV58by/T6TxqcYISZ9T6FNBM2Md49BBY7O y6SbYtr0lds95oWZ7pJ50Fop5C+fcRva3OZEubjbE7nSc1G1+et2G84W/Qra0mk+NpuDRFJ9vWpbO/ 4OvfIgucMhk9ZVg4fR98pvWzBqybNZ7tWj+Zh0xQGYcFmbnrIt23I2+Ao+oQJ/Af0yfRPZnmC8G9yb qczd7BQb058nMeJV69cOGgrTqaRIHrMowUmLmxYM0MrlTkWZLpdw1NuUaf+3+vu5zuUijpx6Lq0tNV wyMQW6RIK6HY52MGiAYvLqQjvF6i8eq7q7CS/RaDkkjwK3FyXwSBSpIGm7J4+oMALK/KFrh4GUPLoG R9+cciYjJSQ3VypRKMrmxxiDiqwTid1ccMQhTxgQiNCBFP9qKV22LgPrOUqtxXjaKcVRQaWtshRn8C VIPJvcb59ukCI3ANbczqh4HWJ90NsTsXmJz84ShERW8yo= X-Developer-Key: i=andrzej.hajda@intel.com; a=openpgp; fpr=FCA8443134DDBF5DE17F034D2362B293DE10FDD7 Subject: [Intel-gfx] [PATCH v3 4/4] drm/i915: Set copy engine arbitration for Wa_16018031267 / Wa_16018063123 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: Jonathan Cavitt , Andrzej Hajda , Nirmoy Das Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Jonathan Cavitt Set copy engine arbitration into round robin mode for part of Wa_16018031267 / Wa_16018063123 mitigation. Signed-off-by: Nirmoy Das Signed-off-by: Jonathan Cavitt Reviewed-by: Andrzej Hajda --- drivers/gpu/drm/i915/gt/intel_engine_regs.h | 3 +++ drivers/gpu/drm/i915/gt/intel_workarounds.c | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/intel_engine_regs.h b/drivers/gpu/drm/i915/gt/intel_engine_regs.h index b8618ee3e3041a..c0c8c12edea104 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_regs.h +++ b/drivers/gpu/drm/i915/gt/intel_engine_regs.h @@ -124,6 +124,9 @@ #define RING_INDIRECT_CTX(base) _MMIO((base) + 0x1c4) /* gen8+ */ #define RING_INDIRECT_CTX_OFFSET(base) _MMIO((base) + 0x1c8) /* gen8+ */ #define ECOSKPD(base) _MMIO((base) + 0x1d0) +#define XEHP_BLITTER_SCHEDULING_MODE_MASK REG_GENMASK(12, 11) +#define XEHP_BLITTER_ROUND_ROBIN_MODE \ + REG_FIELD_PREP(XEHP_BLITTER_SCHEDULING_MODE_MASK, 1) #define ECO_CONSTANT_BUFFER_SR_DISABLE REG_BIT(4) #define ECO_GATING_CX_ONLY REG_BIT(3) #define GEN6_BLITTER_FBC_NOTIFY REG_BIT(3) diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index 192ac0e59afa13..108d9326735910 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -2782,6 +2782,11 @@ xcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) RING_SEMA_WAIT_POLL(engine->mmio_base), 1); } + /* Wa_16018031267, Wa_16018063123 */ + if (NEEDS_FASTCOLOR_BLT_WABB(engine)) + wa_masked_field_set(wal, ECOSKPD(engine->mmio_base), + XEHP_BLITTER_SCHEDULING_MODE_MASK, + XEHP_BLITTER_ROUND_ROBIN_MODE); } static void