From patchwork Wed Mar 19 11:53:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Brzezinka X-Patchwork-Id: 14022529 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 2420DC35FFA for ; Wed, 19 Mar 2025 11:54:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 515A610E30C; Wed, 19 Mar 2025 11:54:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="SAsUx9Xz"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id E6D4310E30C for ; Wed, 19 Mar 2025 11:54:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742385242; x=1773921242; h=date:from:to:cc:subject:message-id:mime-version; bh=+G5gg45F4ZkkHUJ+Ki76LlGHdL7NhoL6tbmL+M6XhTo=; b=SAsUx9XzDVv5QMedbaGpMTu/HTPQpWxvWrMr5x3opl1nyATeaaQWutLo 4+b/fDsF9Y8Vy1MbmdOEkXfsONVK2zImNXkPoEqVLvSHjzPOMrIbsjLwR LqnHxjnChBdv3xzWmt+GeMVmTyiLDc4TIW3p5YTISUOf7wMBr49Ns9z4e grDzO6PHMxfo+FhZTE7XJHhH3A8mgr6U9ozPcK3w+5u6DLyVXBGZDn865 bheJZO19nfBbpC11F6s2YlJt3K1gdHbwnnUlgG8+sjUZbsAHiybTGmZjN Pdv/m2sjlq3mKHgi7HDLOZq3ecdqRG5FNlQHOsPDXVAfZ4NoqgZEP0Fpn w==; X-CSE-ConnectionGUID: 8kumYEeGRTWalDtqwOJwYQ== X-CSE-MsgGUID: HluATEnESj67zsVgudp6YA== X-IronPort-AV: E=McAfee;i="6700,10204,11377"; a="43739635" X-IronPort-AV: E=Sophos;i="6.14,259,1736841600"; d="scan'208";a="43739635" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Mar 2025 04:54:01 -0700 X-CSE-ConnectionGUID: Aa3eI0EkQTqj9PJRKtPr5w== X-CSE-MsgGUID: MsgtoM1lQaWUTQVmGY2VlQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,259,1736841600"; d="scan'208";a="122318482" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orviesa009.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 19 Mar 2025 04:54:01 -0700 Received: from ORSMSX901.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Wed, 19 Mar 2025 04:54:01 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14 via Frontend Transport; Wed, 19 Mar 2025 04:54:01 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.170) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.44; Wed, 19 Mar 2025 04:54:01 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oqICgjvh7ePjnA+fpPEfQeNN47nivVkELOBxGooaIN6Vy+LbVuZycGA1iegyAH7n/vvEyDsBJPUvO+sIcfIskDUFJ6UcMrWBa1QmdMkWp85CoTQA8A042kN2mszslVzYKU0Oh77miSHxxS2a0PFbY24JXR4pcWYoqzFOldB9mqoELzuuNR7u2v4+TelkUa2kYSXUa2eBEeoATQw7qFD/eLDF9iQnp5NkIbJYQSaAf1tFAgcjA9zIpFw9vOaGl4DJtwgbDzKNtaZW4CBdOBg1F3dNHYMAJV/rFKFvhd9m42dMERnmzYUYUVatLqwREcGWd/ATNkAnPxm+JIIbcEdKiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LwYp2HK2jL42oVe7mJVcdtxPmxtzRgRcmcpsK69/F68=; b=j6lcTDdNsb+BqbTe42UoJdJGqKdodrJqSKg71Dd6aLXb5kASRFNHIxSdbBWsDQpATDl+MfUsD+sakRzVehQm2ge0fnO3f2nvHAlaiUJ7itIOtQVSuo414dDNx7Z+BE/nveqIcbBCplH59xmIauloyE/l1w/Ddb3EZE617I88cVZFjakpIxlTRJ+Hw+5c65iCbq37zh2GpIe9+3MfFLKKLQ0tjvEnRmyioBbSOlBjCKF9psiKAyeM2Typr8GxYmjWJFK2tx64VuzuWds3cf4jf3r0FA0UOdijX83/7onWamk4OMyPauWrLyBU8sHa2O9Hc4VC+UKWal49Am5W37Wqtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; Received: from MW4PR11MB6909.namprd11.prod.outlook.com (2603:10b6:303:224::12) by PH7PR11MB7607.namprd11.prod.outlook.com (2603:10b6:510:279::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8534.33; Wed, 19 Mar 2025 11:53:32 +0000 Received: from MW4PR11MB6909.namprd11.prod.outlook.com ([fe80::28da:9438:a3ef:19c0]) by MW4PR11MB6909.namprd11.prod.outlook.com ([fe80::28da:9438:a3ef:19c0%4]) with mapi id 15.20.8534.034; Wed, 19 Mar 2025 11:53:32 +0000 Date: Wed, 19 Mar 2025 11:53:26 +0000 From: Sebastian Brzezinka To: CC: , , Subject: [PATCH] i915/gt: Move context wa to appropriate *_ctx_workarounds_init Message-ID: Content-Disposition: inline X-ClientProxiedBy: ZR0P278CA0094.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::9) To MW4PR11MB6909.namprd11.prod.outlook.com (2603:10b6:303:224::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MW4PR11MB6909:EE_|PH7PR11MB7607:EE_ X-MS-Office365-Filtering-Correlation-Id: 9971cfee-68bf-4a08-679a-08dd66dcabda X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?q?YJe0GOx/A4vZvINiLHDYR62K5KUifJT?= =?utf-8?q?HIsx3cj1QDHf6EGdmKytnBPoFWZkBcHLvnvzxOa4OTTOmMbaFdBdsON6nIFX9M1JW?= =?utf-8?q?FECHmPFuJcqp5DcKWdzzpKFquwET4XPo99psZhpbGt5Jh2Ivhw9CwhtoqRkbNIgrA?= =?utf-8?q?DMXiH3R/XMy4bsPZeEgIyyppCvg8fY9ooE2jkJaGVR2bHLNYk4q8x0NBXleh1eGiT?= =?utf-8?q?0dn7GrfhVg4bBEjSyL+JXxTgtY+NXJZQmPByeomm9KF0BFZPZzzG9G714A1qISARb?= =?utf-8?q?3C4VC1C96dbV/QKsqmujOz9AiPHkuF0umQ6++HggmNRq2ZUqWNFjDHdoBDQ2gSsRU?= =?utf-8?q?2EUS8vYkPeBE/ztUcAn4XxXI2VbxafDW9huwSuaO51ED3e6bB33ZbWYaDzyqywOhH?= =?utf-8?q?kY77pBX5T+zMnx0/zpfq80qd/hiu4DyHUKT2Y3oXn5xe68aTR0ARmxn89jmncU5lp?= =?utf-8?q?0yNXQxkpgPP0/RCQ2yr0tnZCrZqZ+PmPRc9KzTL6+ISWIXLzN4pYwtw7JlismIGKf?= =?utf-8?q?01vUvMI4QYdMMkRieB4UrdSrWR1m2yJy3rgUcBDxfah6NNjzUPQvz+kcXrQnlJylA?= =?utf-8?q?1UQfXSmhZs4jV44fIM67bU3K/+4+OwiWsDQ2sip7LEepEPT3E5qE6hvEE3Q4ouM12?= =?utf-8?q?A+XQyJjTneUhX0ZCuz6qGuB3i48DTAvXWr4rOfnB1wtqULV4b7egDjfe8FWZJrTDE?= =?utf-8?q?hcXu4+3hxKl3oWJyg5gpII/kV4auQhIk7kcItlsbLHcJnELqxNNQoAX9vdoVyyskv?= =?utf-8?q?4VNtPS2yPbldCZfZutxm4fJS96dBtDU9vcDAp8p/LvAU0KMdWFlmeSFjntC3r0s31?= =?utf-8?q?yG4j5nwPQMWLNw8Stm4SmirecT3X8RYh/BEKNciIpiBEaGCEmjmEKS8S31YS3caMe?= =?utf-8?q?AGCTdi8ykuOpCkCVfigUsmN4vuuSaIxIcjT+wLixaXMunYFgxX+GMn5omO/h3YM+C?= =?utf-8?q?hhZSvyRV0rVRR1F6Yt5LVwTcfuwTpncxrlXOrZPeVz+DwyCAAu6yA4aglWE+2Plh3?= =?utf-8?q?TXHmx5bQv6jbWWm5kqFHOwu7RFssme87MQjaYOy0sNbks9wgkYNRTRFd5YpS5Lrjj?= =?utf-8?q?I3wDk/YdBaP0XW7LOTgJ6uQud0hvlayhAWp0hGsUFEXKLtnsE/zEiADwnLGpwyOIt?= =?utf-8?q?HS1E15oLSQ8fQFKkEMMXMsOO+fVNdL7s23JwzdVfEpPayu/5Cgy3NdBCvp20moh8t?= =?utf-8?q?yzbHr522FvzlSsrxvHxi6KW0KQbyPDRhRLB5gPIzeBX2YkueL7xgWmsUSMcRsBS0v?= =?utf-8?q?+PshQ/SPdoiiNpH8hAnEd5ITiylEFjrukcSFs8nNy4CDp6nUUZ410tzYFz40ETzqQ?= =?utf-8?q?J2FivnaIqk5J?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MW4PR11MB6909.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(1800799024); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?5buEEz2eArOyJrSipcj7TdRhulTZ?= =?utf-8?q?JnK1FDcCvp3i1LXLkWR6ruu/QrBLHk5UD3pYJPIAdHjcuWTbR6Glsu/TxCr1oA3Kx?= =?utf-8?q?mDGkJFOxKOfrksS1TRc+Aoq0t/DgVuuUIi+WZJMiGiA1fp/+V6FoqxcpLxJWbFEsr?= =?utf-8?q?LEAoex5rz2KdR4ATOBWwXUI5+rHz6jiVC65Qr5UwsVh2mfEMzcQZ5YlM0VW3M5iMR?= =?utf-8?q?mhbcVU6n11K2LuIzVKkyoemtzYeY30iM8xG69FLK9pMXbIG3+ICcD4XvaelV5HRpZ?= =?utf-8?q?PuAClTu7/WlTm5ERa9X5NkIw/An/4k7RNWQ3iTbR6SX54z4X58MUyLbdhh9hk96OD?= =?utf-8?q?WjbjeaQu6/QfykpXeVRNVA6u5xhqVqnfppRJTgW4p62Uxovma+s0D63wGOEnO03Rb?= =?utf-8?q?tIpOxyGj26o5Ien37he5R0MThhEjjIGWOznH0PquPU8ocHvKqPBX5/zWVdHw1sPUy?= =?utf-8?q?+CeQRdgHQy4un0oufBrAaUXT0zKDsTKR1xkP8/8/0RrRRL3eWDtuGnfTujGkdeT3L?= =?utf-8?q?HYiunKvWNULjrl0oWnVEkaLPC3rQQnUkdVggKtEmrg9cJyAolZcFTAYTpeVYF8TEf?= =?utf-8?q?ESfDfwPacdhkQlvTzZied1LQbLuJHXjRl1xVdw1ihuXQkSxY9PDRk1VEFUc0FP8GH?= =?utf-8?q?Fgr5030ApSHoeeQ7wSo8f6CeABXgkfL4kv9zcYHL/f5geF7bi1PdRKEnkNBU7RAPB?= =?utf-8?q?VskiVUHpW68cADevuKA4fYvpjBshwxAnTpW9iV5t2gc1o4TzaA11yjXQV6ttUeelA?= =?utf-8?q?fFgjAwT8LnaoNWyftIvCesOeNmn102y/GNs4MByb7laFAHi597juF1fZYPnPhFa46?= =?utf-8?q?13EO5ZYdlt08wDglKOwKfH9wSqfYiss+MIaeNdpgOrRupfXq60dLG7+u2mCaD3Okm?= =?utf-8?q?uG1aFmgMNEkFQ1zXu8vnFtRGyLpCRWi+/b9QU9p/zWVyqr6PT1zqR4vn17Ltu4Mst?= =?utf-8?q?UA2MC6Y7bq8wW52hxDCkfQ37aMbkuegVampnlnOVnJgYKbwghYLiMwyLl1RdQvo9M?= =?utf-8?q?Liv4k8RV3RaIFE2VnTgqfcDLOu4rkXkMBAT2iCZx9hQ85OON/qzU/ZLmRsVSXEBGZ?= =?utf-8?q?tHHNw/RDRaRmVACvrdL0c1kmfnUP40EopgVrZz+OKi0nXzjhu07IckMu4v8el4130?= =?utf-8?q?XRfMWSypTQamwkw+VsbgzdvXbjEQ34nuS4VqNvDkaS084i8WtuiqsWMKx0DsdSSge?= =?utf-8?q?CcTJoU1ultNO5Hjh/453aoNhq7d7Vwm4PomWVbCdrWjw4YE0kIIH8ZZPCiG7SsRde?= =?utf-8?q?KI2QoYmYcrj1z39Ez5wVVqNYpCF5Xrq8uGKWDgIVYtjVjomKskvKne+rlFY+/nyPL?= =?utf-8?q?6wGGxFilNwcpvrRGKzQo5BZQ6VorH//gtM68zj8ZKAqm26ZhtYHWacY/8ZevPAbnn?= =?utf-8?q?CehvpdSd6rza+KvmgX5EnohnY2TDyikoeIfn6hGVQZ261/h/FFTYR6/Ng23AS/PKu?= =?utf-8?q?KBvs0ibXX5UFrQv2+HkHUthZRn7GtoYEMCQJXA23wKCuupdd+0F1N/KyTM+unHb+K?= =?utf-8?q?FCwTjGaXRwZ4HKFECs2OXcrzguax7zlx8g=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 9971cfee-68bf-4a08-679a-08dd66dcabda X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB6909.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2025 11:53:31.9918 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: EGpiAtj7FbHC1oBtS7Qcw+HVklOO3grdg1jDZo+Cf/hC7NNwOrhhIjiWfL6+XiJ6JUBVWvRCuoWWWh2E6maO7rmHKs1kwjz0ybCie5X0Cpw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB7607 X-OriginatorOrg: 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" According to bspecs, CACHE_MODE_0 and CACHE_MODE_1 are saved and restored as part of Context. Let's move it to `ctx_workaround_init` instead of `rcs_engine_wa_init`, this way workarounds are applied and saved into the default context. Signed-off-by: Sebastian Brzezinka --- drivers/gpu/drm/i915/gt/intel_workarounds.c | 68 ++++++++++----------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index 116683ebe074..e7969a4a7af6 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -337,12 +337,37 @@ static void gen6_ctx_workarounds_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) { wa_masked_en(wal, INSTPM, INSTPM_FORCE_ORDERING); + + /* WaDisable_RenderCache_OperationalFlush:snb */ + wa_masked_dis(wal, CACHE_MODE_0, RC_OP_FLUSH_ENABLE); + + /* + * From the Sandybridge PRM, volume 1 part 3, page 24: + * "If this bit is set, STCunit will have LRA as replacement + * policy. [...] This bit must be reset. LRA replacement + * policy is not supported." + */ + wa_masked_dis(wal, + CACHE_MODE_0, + CM0_STC_EVICT_DISABLE_LRA_SNB); } static void gen7_ctx_workarounds_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) { wa_masked_en(wal, INSTPM, INSTPM_FORCE_ORDERING); + + /* WaDisable_RenderCache_OperationalFlush:ivb,vlv,hsw */ + wa_masked_dis(wal, CACHE_MODE_0_GEN7, RC_OP_FLUSH_ENABLE); + + /* + * BSpec says this must be set, even though + * WaDisable4x2SubspanOptimization:ivb,hsw + * WaDisable4x2SubspanOptimization isn't listed for VLV. + */ + wa_masked_en(wal, + CACHE_MODE_1, + PIXEL_SUBSPAN_COLLECT_OPT_DISABLE); } static void gen8_ctx_workarounds_init(struct intel_engine_cs *engine, @@ -669,6 +694,15 @@ static void icl_ctx_workarounds_init(struct intel_engine_cs *engine, /* Wa_1406306137:icl,ehl */ wa_mcr_masked_en(wal, GEN9_ROW_CHICKEN4, GEN11_DIS_PICK_2ND_EU); + + if (IS_JASPERLAKE(engine->i915) || IS_ELKHARTLAKE(engine->i915)) { + /* + * "Disable Repacking for Compression (masked R/W access) + * before rendering compressed surfaces for display." + */ + wa_masked_en(wal, CACHE_MODE_0_GEN7, + DISABLE_REPACKING_FOR_COMPRESSION); + } } /* @@ -2306,15 +2340,6 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) GEN8_RC_SEMA_IDLE_MSG_DISABLE); } - if (IS_JASPERLAKE(i915) || IS_ELKHARTLAKE(i915)) { - /* - * "Disable Repacking for Compression (masked R/W access) - * before rendering compressed surfaces for display." - */ - wa_masked_en(wal, CACHE_MODE_0_GEN7, - DISABLE_REPACKING_FOR_COMPRESSION); - } - if (GRAPHICS_VER(i915) == 11) { /* This is not an Wa. Enable for better image quality */ wa_masked_en(wal, @@ -2565,18 +2590,6 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) RING_MODE_GEN7(RENDER_RING_BASE), GFX_TLB_INVALIDATE_EXPLICIT | GFX_REPLAY_MODE); - /* WaDisable_RenderCache_OperationalFlush:ivb,vlv,hsw */ - wa_masked_dis(wal, CACHE_MODE_0_GEN7, RC_OP_FLUSH_ENABLE); - - /* - * BSpec says this must be set, even though - * WaDisable4x2SubspanOptimization:ivb,hsw - * WaDisable4x2SubspanOptimization isn't listed for VLV. - */ - wa_masked_en(wal, - CACHE_MODE_1, - PIXEL_SUBSPAN_COLLECT_OPT_DISABLE); - /* * BSpec recommends 8x4 when MSAA is used, * however in practice 16x4 seems fastest. @@ -2642,19 +2655,6 @@ rcs_engine_wa_init(struct intel_engine_cs *engine, struct i915_wa_list *wal) GEN6_GT_MODE, GEN6_WIZ_HASHING_MASK, GEN6_WIZ_HASHING_16x4); - - /* WaDisable_RenderCache_OperationalFlush:snb */ - wa_masked_dis(wal, CACHE_MODE_0, RC_OP_FLUSH_ENABLE); - - /* - * From the Sandybridge PRM, volume 1 part 3, page 24: - * "If this bit is set, STCunit will have LRA as replacement - * policy. [...] This bit must be reset. LRA replacement - * policy is not supported." - */ - wa_masked_dis(wal, - CACHE_MODE_0, - CM0_STC_EVICT_DISABLE_LRA_SNB); } if (IS_GRAPHICS_VER(i915, 4, 6))