From patchwork Wed Mar 5 14:49:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sebastian Brzezinka X-Patchwork-Id: 14002867 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 4E2F0C19F32 for ; Wed, 5 Mar 2025 14:50:11 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DDCA010E7BA; Wed, 5 Mar 2025 14:50:10 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="YCH1J0si"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2E66910E7BA for ; Wed, 5 Mar 2025 14:50:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741186209; x=1772722209; h=date:from:to:cc:subject:message-id: content-transfer-encoding:mime-version; bh=qU8XliF+gC+kGGpRuhOPxhKgAzVwnopCq667KSLvBwM=; b=YCH1J0siyBSGsEhfq68sYUsuPWnpGH74juHz/FYVmsheadploFKv/fwY AwAyS6hKQK+VOLrWhbGZ78dhg4fA9FYZaZ/3S13AKn5fce0+Vc/KSTT69 5E9WnIJO0miK5KA/08gaIcNXY7HGsG9ANFLbBg+XJYBbSYkWlhzM9ukbw pbX2E7bXc0C7ZFPl7n8S2taezhhmOTGEvEg1kQtmWNtrlMOqhD59DROjY IRdofwYctubNu5QhnabAawy642V+McHJAJFE9sMlMn8lCeQ3kLGze2uLB l2yXGFBj+1+SbvX/I+oy6W0JHMcyUUjx+lmynLwI8HudzGyUjc6//6You w==; X-CSE-ConnectionGUID: AfTH8HcwRHqmC2ul8+X/QQ== X-CSE-MsgGUID: ywBFwmYeQgqvwRROo41qkQ== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52356217" X-IronPort-AV: E=Sophos;i="6.14,223,1736841600"; d="scan'208";a="52356217" Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2025 06:50:09 -0800 X-CSE-ConnectionGUID: 9S2u2L8rT1afI+Lhz0Fu5A== X-CSE-MsgGUID: UmHSW5IQSgWXClh6kV1VXA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,223,1736841600"; d="scan'208";a="123297443" Received: from orsmsx901.amr.corp.intel.com ([10.22.229.23]) by fmviesa005.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Mar 2025 06:50:09 -0800 Received: from ORSMSX903.amr.corp.intel.com (10.22.229.25) 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; Wed, 5 Mar 2025 06:50:08 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by ORSMSX903.amr.corp.intel.com (10.22.229.25) 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, 5 Mar 2025 06:50:08 -0800 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.169) 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, 5 Mar 2025 06:50:07 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hSoLjijI2QjVfP8ipHJ99cKv17LM8lvS84zX39Eu9Kd94u+zWPENZkv2IjGYoTQcbddquep0vQDAizW5aOiCuSWNQiop1Ask+9oz7u/V3bWLSDkmc4+nRfPpLlmwrsQaX1JPwepHNM0Kgl0Zu7F+P4N5x3M+jLVDVXXP6MildjWfYe5264Yhhyf+lohCrionkPeAAws6eweIvPf/fJWPmdO3VbGQZxtG9rUZ6xeXaNP7Lew9HZj1CUp7FNV2FlEzmuHhdO+I9je0zxD/yKcYZaxXKqY0RB0O6d0fTCiIneh34W74trsXW0wY78yQKjBeZsGMv5SxdkvuoGJxGPXWZQ== 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=sVK+iFGaw3CJlkFKQJB+z851PCQQWNS7iM0FqXy6cY4=; b=hxupyKfBkJoiFyGh5aIzaEaEpr2CTDi4hE/L5JRuF0LYv9A8mU3btfEmYaw87ky7Ndbe84LUV+8EYA9z9lvvGFcgQw7OoiKdEULaiJ7mjjTgxOLE36TOebI7XFqZWgJafotkBz5LLiXWHf0awDolK5za1at4e/c7oVGXfeed+bGVrpNdbD1+CbzMj4NMFiUYgOBJVq8LjsBBExOiVR988HCmjpUgVT1UJSqrUF79wz0ian0ExY7ivq/aLgLq26bpExcelmJh6E/1uVMUzrKZVu3LzOL0FnCOOH8KzMxXVobbCa/ashL7Pj8LvS8zytVh46QkD0ybwBjXf4XF+sy8mg== 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 LV8PR11MB8700.namprd11.prod.outlook.com (2603:10b6:408:201::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.28; Wed, 5 Mar 2025 14:49:51 +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.8511.015; Wed, 5 Mar 2025 14:49:51 +0000 Date: Wed, 5 Mar 2025 14:49:46 +0000 From: Sebastian Brzezinka To: CC: , , , Subject: [RFC PATCH] Revert "drm/i915: Disable compression tricks on JSL" Message-ID: Content-Disposition: inline X-ClientProxiedBy: DB7PR05CA0031.eurprd05.prod.outlook.com (2603:10a6:10:36::44) To MW4PR11MB6909.namprd11.prod.outlook.com (2603:10b6:303:224::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MW4PR11MB6909:EE_|LV8PR11MB8700:EE_ X-MS-Office365-Filtering-Correlation-Id: de574a1b-4025-42c0-37c6-08dd5bf4fbaf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?utf-8?q?MPB8E7MgsHTlFBKGBP82dGkBG7UUHLR?= =?utf-8?q?W5dHXrlTbbcFxVY7bLXqBX+N9CGeC2KjiimNORVmSrxhOeuzw+wpLyxdODCsAL9Y1?= =?utf-8?q?QgeTgsKoSKgngrTnP/H3A0y8vKFxAiyofbvc8Sy7wpYYEw4LVKbMwiZSplzmdDzII?= =?utf-8?q?nWN23D5YGH72vC729VxWrfI8PKtnu6Gx0Eg65tN7e83gGSCq3xYFPxHqAb2sEG1RJ?= =?utf-8?q?mhtUy/xnetnLjtqDqNy78ziQqAxoDOdLwSG082185cExhitc3Acclig2riNV/2au0?= =?utf-8?q?biHSPnSX/CNthsZm3dRjVHsNrOdQylNTHbn093pQUwJYChur821+XjtstRsaDW3xN?= =?utf-8?q?dmMlkyRvvCKtIzfImPCCbdWeg4lStCmVaOSZnSnGG45mw9gqA2gYb454KFJvUcPiX?= =?utf-8?q?8HFrA4SFSOdhpUaROGsH1ZnXwZkGLKAtpzspdsruGGxdKWi1urDolTImBQxkuBGE7?= =?utf-8?q?yYbHXxcHbSkEhyHCdvTBy+lkgN/O4eweGe5afF7JvjJUfovUfhRgw/sFONOm31D3T?= =?utf-8?q?jDLCulL/MKv5HkuFaHqT+6b2OrAm9Us9f96phEf7sb0vqD0UsmsCUb2KSzVmsaPKn?= =?utf-8?q?hnTzv4z5Z0h+zu/hyETkL4TaPAIctJNh2fx8tbvfrWzHRL9bU5jB//UzJBw51DKAo?= =?utf-8?q?MHaEg0k257hsTqIE15L/1eSlE+sRKQoNap9v2LUvASmXB2sUyrjQuFJoKifxaQklt?= =?utf-8?q?51/TY1HTHlKzzMrPN8xoFohjh1ox9RL+PNhQvCpCK1sCJGP2yoypWNCQpoRrCkHW1?= =?utf-8?q?wJem6T+Qv12oQ+nba6zq0auAKW+2PDnYNYO2u7dLacbvuoLntE9JMPitLrzsYHWXH?= =?utf-8?q?ZWTLj/DG76WYyE0IH77c51vN/r47gZqUm6vdq6QCM9Ok+nWWtIW1Ut6nUlLjn7uoM?= =?utf-8?q?kkfJ30tkpI1xgmtLSDhd8UlI8IGm4XKoE3OB4nlqHhF5LXRm1RyQ4dL+u1Xnr8vdF?= =?utf-8?q?UaLewdYD8vSC3X0S6zZUW7LXPIpnNJve5ZupO2jiT7iB1RQCDgTzo4Hycu5RcuF8L?= =?utf-8?q?gwrQrrGG9knp9V1hvm3CAgKz5h2sgIseF8dQVDesqSxbXp5jUPjVWd3wvk+Ew6ZDa?= =?utf-8?q?U7tAEARE4MmBAq/E2pFFVzVucmxhvuXLAEbEUpSl/afE8VbARBVKv5T5pujB/verj?= =?utf-8?q?7Hp/7/x+OpRPLoCIHxl7KdoRXqK7wuEQY2HBqJ4nNQtS3ZnmXmTtI5ANm3Qwe0py1?= =?utf-8?q?qKMGce73ER2ULc7ATNu9x7RBxAoxsbxtHfKwVWaNULXUJjjH5g8w9pglwMApcgU6C?= =?utf-8?q?xsk0vZQFR69wneFPerz6lQsM0jmnVEhYkal1VZrSkuKO8cocNqltLW7ouPCydW2Qn?= =?utf-8?q?Rvsl40JoEOK0?= 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)(1800799024)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?iUmIuND+UBA/fvvMywcmLqtA4NRO?= =?utf-8?q?NOqmDQDKzIUJN/w/5V9tw7L+UfFb9qM8GS1hnDBW72gC5vfo56DafLuSC7URNlRsp?= =?utf-8?q?Kd3AiYcyQwNn8dVncs+QFGBiE5Z4t79OhPDhRN4GsshXQOvYPBh0/wglriFcB2HNE?= =?utf-8?q?jA4MGgoUOWGzXGbISNZRjKKbcB9ikiNCHttRvs622l1nb3M/wM71Z1EFxAs9bmmRI?= =?utf-8?q?g2sIlHCDwhaoJjkc7c3521L0/kV+kb7Dg7xWCnzkd2zg0qs4jUh6OreS0N6/ZF1ud?= =?utf-8?q?2D6/TEH3vtOf7azk1YmIFwHgYUmnmV6s1Zuc6hr46+GmDbZHaqCjj77r9nc2z12CB?= =?utf-8?q?4xTgAhih5lXk70+lOA5+pB1wCgevrD5lEP8CKznNxSTBEkpVXKFtTS1bT4VJRPX4a?= =?utf-8?q?a2g2ucgeeU24MJgxCN8tX3ySz44mMkL5oVNZFBBYsqXcKv613qxKcEZrpkD6rDh5g?= =?utf-8?q?/Yex+ENmRYoOBb7mGPFTS3WVe3EcaeF/QSqIeiij9XOcV4zhXHnciOqW/TrsYhZTt?= =?utf-8?q?QNp8I+YCabbFwK4g5ZMfjdpPI14YoWfxfb6N/f6KuxTzfgRkR5Dy2TX0SdNkUQ4Sk?= =?utf-8?q?SP4ytTErl2rJgEw0TLyz/yWMWaLAnz662+QjRgX2UxLVxmC/T5YBAJP9AvXIx8K90?= =?utf-8?q?VwIhkaQGivHIobKAGYWXkBXm/30MjD2hadYLViI1ErpLJfxHVedaZzd35HuYwZ38Z?= =?utf-8?q?2PMqrCM8jFJan7MtATpWKlOtgilkmp/A9mBodHAZVJ9LMjVAna1aQrdsrBt0RLh10?= =?utf-8?q?gcCVkQRLFe8H1VkyYuiXuupRZx1M0ghQXEgMR2F7Dgv9li0AIzBcimHvibc67HryP?= =?utf-8?q?hCAUt/e6WPpBjYZn84fgRvFYG2uAMzlfaBV6q3PMj+9HFCsHikmjjRMW5m1NxYGht?= =?utf-8?q?Gwvr+eEUnRPtEjWlDdbIcsEluWh/YF3ZP1ghvMJTTRarEW8YWc9x/fWrRJFolccTT?= =?utf-8?q?m1ArNKqsDuX2QWeXmWR2gjOJbSL97ZnilJapSghwxDfu0VRq1kVAaXtkZw9st5KHa?= =?utf-8?q?0GX5esobJ3uEEfyolbd+dVeKs/53BVleOzitg2j6KEvKHqOGWyQ0OTphc6M5FsdUl?= =?utf-8?q?mW45dsAQJ5sPYD2ASFLPXc3EcvqmTNVn+I35I6yacIi4u1JMFrN7mPwDjhH632m0Z?= =?utf-8?q?2ns2FbvXdumZOBbIJA5omEVgB8QYofQjmZqVGbsXfVH3dvkPzIeONyluu8HBSgTDe?= =?utf-8?q?4XRTNVSBJAkejVCxHYo0kZHLSpJRcMuB4yT7znehZenPnRKYUPtKwvdEleW4KJgfp?= =?utf-8?q?bSdBf7kdfIaMAxrFF6ggB92wWm/zzj2+/LREo971LwlqrJQmTHCZwSk64chUHW5jP?= =?utf-8?q?i3owaZCTEaRlcYehVJW3eH+bTLBy4ipogkg9C0UXDu0WQqtUMk8yFcDi3cSQUVGfg?= =?utf-8?q?K+xuWDzMKIwVrs6OmDblITS8SagzYzH/SBl2Sb3ltZUbdl8PPrBW+DaAzuVxvG5gH?= =?utf-8?q?soFRJui3Og+/nVTVIl1ZpuA3UEmoSGokrqYWDEuvKl6OsS78Y5f9DJ7KwgJrFqJQH?= =?utf-8?q?SMRYXFVXZPlIC+vIKsfs6CmdM/G6gJ5sww=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: de574a1b-4025-42c0-37c6-08dd5bf4fbaf X-MS-Exchange-CrossTenant-AuthSource: MW4PR11MB6909.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2025 14:49:51.0400 (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: jLvjFSTB6Wmot5P5OLOYYftOtjWQSgi8VBd6/sw+y9ISJ53P4TFeAt5Vbh7KVlgUbp5RaR4vy7xDM+uCg7lMFhob6b9TYSD4m6YErDpDd6w= X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV8PR11MB8700 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" This reverts commit 0ddae025ab6cefa9aba757da3cd1d27908d70b0e. According to bspec 14181, CACHE_MODE_0 is a register that's under userspace control, and DISABLE_REPACKING_FOR_COMPRESSION workaround should be already in all recent Mesa releases. So, there is no need to include it in kernel. Also, this workaround·sporadically fails to load: ``` ERROR GT0: engine workaround lost on application! (reg[7000]=0x0, relevant bits were 0x0 vs expected 0x8000) ``` Signed-off-by: Sebastian Brzezinka --- drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1 - drivers/gpu/drm/i915/gt/intel_workarounds.c | 9 --------- 2 files changed, 10 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h index 7421ed18d8d1..52ddfa9f3ad3 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h +++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h @@ -440,7 +440,6 @@ #define XEHPG_INSTDONE_GEOM_SVG MCR_REG(0x666c) #define CACHE_MODE_0_GEN7 _MMIO(0x7000) /* IVB+ */ -#define DISABLE_REPACKING_FOR_COMPRESSION REG_BIT(15) /* jsl+ */ #define RC_OP_FLUSH_ENABLE (1 << 0) #define HIZ_RAW_STALL_OPT_DISABLE (1 << 2) #define CACHE_MODE_1 _MMIO(0x7004) /* IVB+ */ diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c index 116683ebe074..51839f270d57 100644 --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c @@ -2306,15 +2306,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,