From mboxrd@z Thu Jan 1 00:00:00 1970 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 3971BC83F26 for ; Wed, 30 Jul 2025 19:39:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E8AF610E359; Wed, 30 Jul 2025 19:39:32 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="HR7RH9lK"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8C78210E359 for ; Wed, 30 Jul 2025 19:39:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1753904371; x=1785440371; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=lf8abKd6K5fl83EZO2n0GA23Q6bqTmhw80SFyGvztYE=; b=HR7RH9lKbICKkkA5ScglU21G0Y3mcCRGH+Hzrorb39CdmxUBv6P7ZsTW iOvvVBSMZ8Qaj7xtL9S7uuVlv3ZUeh2u0FL/8P/c6k8hOsmm+gSI1xglQ wvRP/2uWz7Fp77rH49JpfFT+YoxKAo7q4TMRGFiABwTS70Mk5NO0g/6/J 7KwACi9fLjCJzzlqcn7Aj+STpwKF8Sd4fsmys+K37TahHhAPiJsXkegPV v5LJHMW0TyufKY50LI+qBns510EWyW6PfN0A1xXdQAfL/ahx4sxgbZoBe Rzlp2pvbvfy+/y+bj1XKqV7CfnRgxqpv/ZgNdeVoS3kJ1Qj1y0kISOaJX w==; X-CSE-ConnectionGUID: 7WbksL/nSrO6+1jf3dcQVg== X-CSE-MsgGUID: FcfY1LRzR9eidaRmnEgfMg== X-IronPort-AV: E=McAfee;i="6800,10657,11507"; a="56367552" X-IronPort-AV: E=Sophos;i="6.16,350,1744095600"; d="scan'208";a="56367552" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2025 12:38:29 -0700 X-CSE-ConnectionGUID: OhLKg12aQeqsmbopB7OM2Q== X-CSE-MsgGUID: RLq0GukfSfuEBEwLsALo/A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,350,1744095600"; d="scan'208";a="163417184" Received: from orsmsx901.amr.corp.intel.com ([10.22.229.23]) by orviesa008.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2025 12:38:25 -0700 Received: from ORSMSX902.amr.corp.intel.com (10.22.229.24) 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.1748.26; Wed, 30 Jul 2025 12:38:22 -0700 Received: from ORSEDG902.ED.cps.intel.com (10.7.248.12) by ORSMSX902.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1748.26 via Frontend Transport; Wed, 30 Jul 2025 12:38:22 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (40.107.244.89) by edgegateway.intel.com (134.134.137.112) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.25; Wed, 30 Jul 2025 12:38:22 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=A3npBk00LcbdD48IdJMIs29aeUReFZ1sGypctQGUEFCwL8yGJ1fj9mozwtNwmlPN9mV+BKEMVRfsXmxLSm/dPMaXtuWZCSCwzPst1PQ8b5fmZFxPf9EdP+fcBpXjxozRzJDM2coZc0Iq5YyWr8fDsdzbBB6X2OXQWV623/xAXjCh9Lwi3vSZjshu4ELHgDBfZd0kq+bdYiYV1Hh5dy6b3Md8BqPC7twoZUoEdjURhXd3KjpWz+i7dgAJ7iGso54Mv1cbAL+U3FEQgPnG3acwGYTU3U0a/cA85JXdEVMGTtvCpJibuLG6Du0pX7c3EP6/VMd4dU3aLqHak09PgMAYQA== 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=M/s2YURLhjjEkHkNSct/bxn9/XpqCGfpoQrKuaqr75w=; b=bb5uiY4pP6PIMasxvM8SxbslkilJLIdYkwu1oxNuGGQjCf3Nj9moRh4/E4owpjK4eJwVmUOtaeMHBiOzW7UfQdMGyKjGXrV8O4czYT6z8jqyFMwR8z/C7wMypelWsl+0ksYDmkRxXlKd2vhxPJYNGf6qP89eDOpr6RLA2+P9n8gsgt5jcsQhjDIbp/aXsxPGZWvYY4aKRM8N+f1CoC7tOKG34IaqxiXvdhQ0gGkMorr6GvsvRPAJK1L2knRMp+vKMrDd3MZxCThAQ8pCcqv2J7T+hpGEKq7s5rNh2K/de+swwESp/w1feJIM2HXEpduylWCxm6Q72OTl6trid5GvjQ== 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 CYYPR11MB8430.namprd11.prod.outlook.com (2603:10b6:930:c6::19) by PH8PR11MB6975.namprd11.prod.outlook.com (2603:10b6:510:224::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8964.25; Wed, 30 Jul 2025 19:38:14 +0000 Received: from CYYPR11MB8430.namprd11.prod.outlook.com ([fe80::76d2:8036:2c6b:7563]) by CYYPR11MB8430.namprd11.prod.outlook.com ([fe80::76d2:8036:2c6b:7563%5]) with mapi id 15.20.8989.011; Wed, 30 Jul 2025 19:38:13 +0000 Date: Wed, 30 Jul 2025 15:38:10 -0400 From: Rodrigo Vivi To: Matt Atwood CC: Subject: Re: [PATCH] drm/xe: rename XE_WA to XE_GT_WA Message-ID: References: <20250730172341.990800-1-matthew.s.atwood@intel.com> Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20250730172341.990800-1-matthew.s.atwood@intel.com> X-ClientProxiedBy: SJ0PR13CA0066.namprd13.prod.outlook.com (2603:10b6:a03:2c4::11) To CYYPR11MB8430.namprd11.prod.outlook.com (2603:10b6:930:c6::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CYYPR11MB8430:EE_|PH8PR11MB6975:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d62e13f-f640-4bf1-dc96-08ddcfa09fa0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?NyCb+WwmEKFeVpQ6QQCQ6SEBNJEZ6NG77WsuSWAWUS5u4VSSDpgJzhyc8Y8D?= =?us-ascii?Q?+6EqGGnIQ9gWkCjQTHXxFWmyCqg4VhBwwkfkcV0osurFSNg5bMhGil6X99pl?= =?us-ascii?Q?yX2xpZJtDBWvHs8Z7xKSVzoc21Uxeh79MEb3sa8CgUqM5+oJAhKgsa8SnPdO?= =?us-ascii?Q?BVRxkySh7RDRX8UULwfg7ZX1PgMRPOL0yS7KsAdy/4qB99tZEzKH5rPyBCq3?= =?us-ascii?Q?w4MJ1dCc/t8HR0bql+5MWclXMO4kkvW3q4Aiw97zdNfANakTr1DjPw3T2sbg?= =?us-ascii?Q?RPXtPLZPU1UQED/8XzcgRCGij15Hg77oxMHIPaHWia7ubjAJU/2lJ7vgSq0g?= =?us-ascii?Q?DSUGMUovjE2ZvFld+II9OW3i6P18JQI0atmW8K40fHWVGdDZBWxluYy1KxN7?= =?us-ascii?Q?CwYEKXfR2q/QHFCIiqI/aTHB/W3pUToO013NrQuBZZt9YlIZ6wqkqYxnvydB?= =?us-ascii?Q?XLR4ogSkp3ujGYgX4nFJClH5ADfp3mKQYlvGeT1Es/g7G+OqW6t8tXPVC1Yy?= =?us-ascii?Q?CHjtehRQwxfK6gQ5IxGGGe+1rySbBn5z2cXIqR3WPyb0miLTnKV7TuFsA5tf?= =?us-ascii?Q?DOjigOcVLH0wqO/6oE83JIsIskoFyho9D9pP9Z+RBw1G5zlvcbgQdWqvFoST?= =?us-ascii?Q?9TayXfg8P4t/ZEcE2v01vYH4mtMvYud0nzR9k9y9ZO1ZIKwiBjqwSqYhdoHO?= =?us-ascii?Q?lytFqpzzI3y91KXuGUqbDruel3vm3hmlCW3zy3gSoMy7f4KOjS552fVlW7RE?= =?us-ascii?Q?Iw7dKRNvhppD2KEVbKiIVFkE27vkINgKysPKKz456BLHkBVDM3NsxE7xQJNZ?= =?us-ascii?Q?/ZQgkSVzYLW6f7jpb0qwZsk87mq3HBQ2ISasd2t/kXHaB6ES2oG3uvnFi4ZX?= =?us-ascii?Q?K2HGkmASlBMOeT3wD3vs5TYETD4NZSD78A3mbYZPo/l2idGvAMt194do5NIr?= =?us-ascii?Q?ogyEDjozvrVG9GmW3Vh8aKB6NEaFKy1KNWaHAy8L7o4o5kRIEaT69Tn8SFFb?= =?us-ascii?Q?ELYwubsNxcJ3B50x4ymIBIdfZ0z6wFJeAkpbDvrMoOmz4qoHNbW0zqGLbfNR?= =?us-ascii?Q?+zr8wF6HIyuN2I6wY9AIN2yruS5aJitk9SV/2sKdKFFdwb4dcWfjzW5yI0xK?= =?us-ascii?Q?PqdSMCvpRm8u3/AYFsEHBYw+ZN0xaGU8dN9Yj4AaKUgGA2xeyTLL7Dt5RtFa?= =?us-ascii?Q?cVgrbQNPoVH7ZYwtnn9rodajZykblTdHPiPhPiUCkVOsPT7wn1OTeUDCgDuF?= =?us-ascii?Q?SNkm7gsRkxZHggjWNMn0g4HnMvzmiS2a40nghSLpMqSLkgmh5jA/Z+mnDGit?= =?us-ascii?Q?TigUESwHr8K5sl9bIVrdroYKKfe+/nwJF7xGPKYrkE6RoklRqdsx6mRtwgWc?= =?us-ascii?Q?r4hygwvXtnxHxA0LX/OpaihGjvpQxwUtVraLvJ4Drcrk4BjcCg=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CYYPR11MB8430.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(1800799024)(366016)(376014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?12umeaNkyDntelg/ZhjIsd0KsdEg5ZUQ/J7DhXbA4JYVGY1p1mUyMvsfnoqI?= =?us-ascii?Q?LofJinWlctTxsVB2R8tClzqrb8tBojEN67O1pggPEAQ24ZaE0LUgYln0+tWv?= =?us-ascii?Q?Qp9QJFsEVTqAuWAt+J/dzjHL2la1hRejegM262eShqYbrqDei/sNHJDjMQVH?= =?us-ascii?Q?ukQ1hMucpX2WUy0J/wpNstMTikM3LH+mgMNPEoF+OaJPQ2/9qywKjM78S/dn?= =?us-ascii?Q?6DAG7D4YMKKYyw8vmEUBNj8dVBNQ2N2mCpjuEF7cCT/YluEmlkl7asfXQJ4Y?= =?us-ascii?Q?ycm6dv9dObumL46L8Cit4iaAMO8IHJdk06czASie4R/j2RuZOD2740LH1PaV?= =?us-ascii?Q?hYWT+61rVpv+G2jxV3GclOdNvQi4THxPdB1SuU+yeGozjJ3AVtsURrX1nqU4?= =?us-ascii?Q?Pi7ugTQzk9urh1y8l6Tk04QYiN0Cu/vcPI2+fLX9sZmdQDvjVV8P5PjZMW+9?= =?us-ascii?Q?qrwskTnjxL+yLIjPM5CaSaOslMDBrrZIFRP3iPonXSq8NgEzOsSm7kN+lXsV?= =?us-ascii?Q?epMI2RU3yKJrBVNeLDxzXMinEoEMlhKTylLm98cDjODIN572n9zbrkGS2AJK?= =?us-ascii?Q?6q+a4WE2cARMevI4+yL9WCJIq8j3Zamwfdb+kZ/auCH88ZZy/GgA4bILW6nU?= =?us-ascii?Q?D2pd/qAFQAMlllPaupbdBRluc+ukJvlWJXDrI896AvPm4aqsdF6JYiPm/7x6?= =?us-ascii?Q?w47R8D+NwvcpASWwHM5BTs0t3vsgufg47HRVk5VMRoptGHGNjFMCK6zud5mL?= =?us-ascii?Q?9l8xKME6FFozL3vWJu/9kBVZnGP37L3OqbDMIBOoFpxBGOyGR64dYPc/ubnX?= =?us-ascii?Q?brDITVHJKq2sGLywsStc+8miL8eMhlvPlygwByzCj63t6H2LvvR5sB72pQaf?= =?us-ascii?Q?7lwyeFV+qcjffITcWt2De+1+Bn1eL2Z8jrd/PhE4ngXEPuMh4J8pH7Tny2Xs?= =?us-ascii?Q?tF4lIRk5zv5vl0gRT2Fbed1f6meZZk6NMURqdJ+vWMNYbURqIrVhqzpJxHML?= =?us-ascii?Q?HVapyitE4Hi2KMM4GI3ILKiBzKCMBAVL7xjPSEpbGwLzlJrt7ytzC/cWb9/7?= =?us-ascii?Q?cgXaapJASUUQ5bFvpAW5s+/m6T03o7LaTHvEmcBgHXvtASZ3y2DT9v1tPp4N?= =?us-ascii?Q?bL09p6mVPo430cw41Vfgi3DXNVHeuJdsHea3CmDtDR59ZfGy5ypzFKih8BA/?= =?us-ascii?Q?3Qe7UjFWac9XcTBE9zmkKF2v+s5hdFzVhQVqS15SQYxlJzqpIkWGma4eg/3M?= =?us-ascii?Q?NTHMzpARqXoeMJqRmPmYP/JbqaaG0HCWpZEana6OfVcZXjI29GRZvFpB24pd?= =?us-ascii?Q?Xv+LgosP1UtoRTn4KyNyXeebcS+i5Sm9yHBiJw1KClEYokY7nAImkJSYaFAK?= =?us-ascii?Q?+GLkivzZ0f/TxGsJx6KIQOudzJKPwQifo31CHdJgBgbNQcGRwRccmTbw+7SW?= =?us-ascii?Q?pEhrmtjfc7HSHHuZf2HJYaLrCeK0TRB4siNJhvGavRSEUN6J7aKFHLlxbOfd?= =?us-ascii?Q?OydoYSCucsrHyZsJv91RgxbHaRpHeP0eBsLsEDs6aswOXAvrPN8l9lHX5gKS?= =?us-ascii?Q?EMehtYWUB1mcvBsH05MeaWpoL6JmN9hHKkxRmChUdyyFPD+7VmKfMZ+0V5xp?= =?us-ascii?Q?sg=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 6d62e13f-f640-4bf1-dc96-08ddcfa09fa0 X-MS-Exchange-CrossTenant-AuthSource: CYYPR11MB8430.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 19:38:13.9303 (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: 29ltivROwDoxxGSUpsW8pGr5yooBjQAMjW6bZ8Umw8cOjZ8bhYsPSVcxGjZrT1iNM8rm8MsGB7ayCdpc5PZghw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB6975 X-OriginatorOrg: intel.com X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Wed, Jul 30, 2025 at 10:23:41AM -0700, Matt Atwood wrote: > Now that there are two types of wa tables and infrastructure, be more > concise in the naming of GT wa macros. > > Signed-off-by: Matt Atwood > --- > drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 2 +- > drivers/gpu/drm/xe/display/xe_display_wa.c | 2 +- > drivers/gpu/drm/xe/display/xe_plane_initial.c | 2 +- > drivers/gpu/drm/xe/xe_device.c | 6 +++--- > drivers/gpu/drm/xe/xe_eu_stall.c | 4 ++-- > drivers/gpu/drm/xe/xe_ggtt.c | 8 ++++---- > drivers/gpu/drm/xe/xe_gsc.c | 6 +++--- > drivers/gpu/drm/xe/xe_gt.c | 6 +++--- > drivers/gpu/drm/xe/xe_gt_topology.c | 2 +- > drivers/gpu/drm/xe/xe_gt_types.h | 2 +- > drivers/gpu/drm/xe/xe_guc.c | 14 ++++++------- > drivers/gpu/drm/xe/xe_guc_ads.c | 20 +++++++++---------- > drivers/gpu/drm/xe/xe_guc_pc.c | 10 +++++----- > drivers/gpu/drm/xe/xe_hw_engine.c | 2 +- > drivers/gpu/drm/xe/xe_lrc.c | 8 ++++---- > drivers/gpu/drm/xe/xe_oa.c | 8 ++++---- > drivers/gpu/drm/xe/xe_query.c | 4 ++-- > drivers/gpu/drm/xe/xe_ring_ops.c | 6 +++--- > drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 2 +- > drivers/gpu/drm/xe/xe_vm.c | 2 +- > drivers/gpu/drm/xe/xe_wa.c | 2 +- > drivers/gpu/drm/xe/xe_wa.h | 4 ++-- > 22 files changed, 61 insertions(+), 61 deletions(-) > > diff --git a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c > index fba9617a75a5..d96ba2b51065 100644 > --- a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c > +++ b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c > @@ -41,7 +41,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, > size = PAGE_ALIGN(size); > obj = ERR_PTR(-ENODEV); > > - if (!IS_DGFX(xe) && !XE_WA(xe_root_mmio_gt(xe), 22019338487_display)) { > + if (!IS_DGFX(xe) && !XE_GT_WA(xe_root_mmio_gt(xe), 22019338487_display)) { > obj = xe_bo_create_pin_map(xe, xe_device_get_root_tile(xe), > NULL, size, > ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT | > diff --git a/drivers/gpu/drm/xe/display/xe_display_wa.c b/drivers/gpu/drm/xe/display/xe_display_wa.c > index 68d1387d81a0..8ada1cbcb16c 100644 > --- a/drivers/gpu/drm/xe/display/xe_display_wa.c > +++ b/drivers/gpu/drm/xe/display/xe_display_wa.c > @@ -14,5 +14,5 @@ bool intel_display_needs_wa_16023588340(struct intel_display *display) > { > struct xe_device *xe = to_xe_device(display->drm); > > - return XE_WA(xe_root_mmio_gt(xe), 16023588340); > + return XE_GT_WA(xe_root_mmio_gt(xe), 16023588340); > } > diff --git a/drivers/gpu/drm/xe/display/xe_plane_initial.c b/drivers/gpu/drm/xe/display/xe_plane_initial.c > index 3eab9a569661..826ac3d578b7 100644 > --- a/drivers/gpu/drm/xe/display/xe_plane_initial.c > +++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c > @@ -123,7 +123,7 @@ initial_plane_bo(struct xe_device *xe, > phys_base = base; > flags |= XE_BO_FLAG_STOLEN; > > - if (XE_WA(xe_root_mmio_gt(xe), 22019338487_display)) > + if (XE_GT_WA(xe_root_mmio_gt(xe), 22019338487_display)) > return NULL; > > /* > diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c > index d04a0ae018e6..6aaff65823b2 100644 > --- a/drivers/gpu/drm/xe/xe_device.c > +++ b/drivers/gpu/drm/xe/xe_device.c > @@ -886,7 +886,7 @@ int xe_device_probe(struct xe_device *xe) > } > > if (xe->tiles->media_gt && > - XE_WA(xe->tiles->media_gt, 15015404425_disable)) > + XE_GT_WA(xe->tiles->media_gt, 15015404425_disable)) > XE_DEVICE_WA_DISABLE(xe, 15015404425); > > xe_nvm_init(xe); > @@ -1042,7 +1042,7 @@ void xe_device_l2_flush(struct xe_device *xe) > > gt = xe_root_mmio_gt(xe); > > - if (!XE_WA(gt, 16023588340)) > + if (!XE_GT_WA(gt, 16023588340)) > return; > > fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT); > @@ -1086,7 +1086,7 @@ void xe_device_td_flush(struct xe_device *xe) > return; > > root_gt = xe_root_mmio_gt(xe); > - if (XE_WA(root_gt, 16023588340)) { > + if (XE_GT_WA(root_gt, 16023588340)) { > /* A transient flush is not sufficient: flush the L2 */ > xe_device_l2_flush(xe); > } else { > diff --git a/drivers/gpu/drm/xe/xe_eu_stall.c b/drivers/gpu/drm/xe/xe_eu_stall.c > index af7916315ac6..fdd514fec5ef 100644 > --- a/drivers/gpu/drm/xe/xe_eu_stall.c > +++ b/drivers/gpu/drm/xe/xe_eu_stall.c > @@ -649,7 +649,7 @@ static int xe_eu_stall_stream_enable(struct xe_eu_stall_data_stream *stream) > return -ETIMEDOUT; > } > > - if (XE_WA(gt, 22016596838)) > + if (XE_GT_WA(gt, 22016596838)) > xe_gt_mcr_multicast_write(gt, ROW_CHICKEN2, > _MASKED_BIT_ENABLE(DISABLE_DOP_GATING)); > > @@ -805,7 +805,7 @@ static int xe_eu_stall_disable_locked(struct xe_eu_stall_data_stream *stream) > > cancel_delayed_work_sync(&stream->buf_poll_work); > > - if (XE_WA(gt, 22016596838)) > + if (XE_GT_WA(gt, 22016596838)) > xe_gt_mcr_multicast_write(gt, ROW_CHICKEN2, > _MASKED_BIT_DISABLE(DISABLE_DOP_GATING)); > > diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c > index 249713139f69..e03222f5ac5a 100644 > --- a/drivers/gpu/drm/xe/xe_ggtt.c > +++ b/drivers/gpu/drm/xe/xe_ggtt.c > @@ -106,10 +106,10 @@ static unsigned int probe_gsm_size(struct pci_dev *pdev) > static void ggtt_update_access_counter(struct xe_ggtt *ggtt) > { > struct xe_tile *tile = ggtt->tile; > - struct xe_gt *affected_gt = XE_WA(tile->primary_gt, 22019338487) ? > + struct xe_gt *affected_gt = XE_GT_WA(tile->primary_gt, 22019338487) ? > tile->primary_gt : tile->media_gt; > struct xe_mmio *mmio = &affected_gt->mmio; > - u32 max_gtt_writes = XE_WA(ggtt->tile->primary_gt, 22019338487) ? 1100 : 63; > + u32 max_gtt_writes = XE_GT_WA(ggtt->tile->primary_gt, 22019338487) ? 1100 : 63; > /* > * Wa_22019338487: GMD_ID is a RO register, a dummy write forces gunit > * to wait for completion of prior GTT writes before letting this through. > @@ -284,8 +284,8 @@ int xe_ggtt_init_early(struct xe_ggtt *ggtt) > > if (GRAPHICS_VERx100(xe) >= 1270) > ggtt->pt_ops = (ggtt->tile->media_gt && > - XE_WA(ggtt->tile->media_gt, 22019338487)) || > - XE_WA(ggtt->tile->primary_gt, 22019338487) ? > + XE_GT_WA(ggtt->tile->media_gt, 22019338487)) || > + XE_GT_WA(ggtt->tile->primary_gt, 22019338487) ? > &xelpg_pt_wa_ops : &xelpg_pt_ops; > else > ggtt->pt_ops = &xelp_pt_ops; > diff --git a/drivers/gpu/drm/xe/xe_gsc.c b/drivers/gpu/drm/xe/xe_gsc.c > index 1d84bf2f2cef..f5ae28af60d4 100644 > --- a/drivers/gpu/drm/xe/xe_gsc.c > +++ b/drivers/gpu/drm/xe/xe_gsc.c > @@ -266,7 +266,7 @@ static int gsc_upload_and_init(struct xe_gsc *gsc) > unsigned int fw_ref; > int ret; > > - if (XE_WA(tile->primary_gt, 14018094691)) { > + if (XE_GT_WA(tile->primary_gt, 14018094691)) { > fw_ref = xe_force_wake_get(gt_to_fw(tile->primary_gt), XE_FORCEWAKE_ALL); > > /* > @@ -281,7 +281,7 @@ static int gsc_upload_and_init(struct xe_gsc *gsc) > > ret = gsc_upload(gsc); > > - if (XE_WA(tile->primary_gt, 14018094691)) > + if (XE_GT_WA(tile->primary_gt, 14018094691)) > xe_force_wake_put(gt_to_fw(tile->primary_gt), fw_ref); > > if (ret) > @@ -593,7 +593,7 @@ void xe_gsc_wa_14015076503(struct xe_gt *gt, bool prep) > u32 gs1_clr = prep ? 0 : HECI_H_GS1_ER_PREP; > > /* WA only applies if the GSC is loaded */ > - if (!XE_WA(gt, 14015076503) || !gsc_fw_is_loaded(gt)) > + if (!XE_GT_WA(gt, 14015076503) || !gsc_fw_is_loaded(gt)) > return; > > xe_mmio_rmw32(>->mmio, HECI_H_GS1(MTL_GSC_HECI2_BASE), gs1_clr, gs1_set); > diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c > index c8eda36546d3..ed21ca158a3d 100644 > --- a/drivers/gpu/drm/xe/xe_gt.c > +++ b/drivers/gpu/drm/xe/xe_gt.c > @@ -105,7 +105,7 @@ static void xe_gt_enable_host_l2_vram(struct xe_gt *gt) > unsigned int fw_ref; > u32 reg; > > - if (!XE_WA(gt, 16023588340)) > + if (!XE_GT_WA(gt, 16023588340)) > return; > > fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT); > @@ -127,7 +127,7 @@ static void xe_gt_disable_host_l2_vram(struct xe_gt *gt) > unsigned int fw_ref; > u32 reg; > > - if (!XE_WA(gt, 16023588340)) > + if (!XE_GT_WA(gt, 16023588340)) > return; > > if (xe_gt_is_media_type(gt)) > @@ -958,7 +958,7 @@ int xe_gt_sanitize_freq(struct xe_gt *gt) > if ((!xe_uc_fw_is_available(>->uc.gsc.fw) || > xe_uc_fw_is_loaded(>->uc.gsc.fw) || > xe_uc_fw_is_in_error_state(>->uc.gsc.fw)) && > - XE_WA(gt, 22019338487)) > + XE_GT_WA(gt, 22019338487)) > ret = xe_guc_pc_restore_stashed_freq(>->uc.guc.pc); > > return ret; > diff --git a/drivers/gpu/drm/xe/xe_gt_topology.c b/drivers/gpu/drm/xe/xe_gt_topology.c > index 8c63e3263643..a0baa560dd71 100644 > --- a/drivers/gpu/drm/xe/xe_gt_topology.c > +++ b/drivers/gpu/drm/xe/xe_gt_topology.c > @@ -138,7 +138,7 @@ load_l3_bank_mask(struct xe_gt *gt, xe_l3_bank_mask_t l3_bank_mask) > * but there's no tracking number assigned yet so we use a custom > * OOB workaround descriptor. > */ > - if (XE_WA(gt, no_media_l3)) > + if (XE_GT_WA(gt, no_media_l3)) > return; > > if (GRAPHICS_VER(xe) >= 30) { > diff --git a/drivers/gpu/drm/xe/xe_gt_types.h b/drivers/gpu/drm/xe/xe_gt_types.h > index dfd4a16da5f0..ef0f2eecfa29 100644 > --- a/drivers/gpu/drm/xe/xe_gt_types.h > +++ b/drivers/gpu/drm/xe/xe_gt_types.h > @@ -413,7 +413,7 @@ struct xe_gt { > unsigned long *oob; > /** > * @wa_active.oob_initialized: mark oob as initialized to help > - * detecting misuse of XE_WA() - it can only be called on > + * detecting misuse of XE_GT_WA() - it can only be called on > * initialization after OOB WAs have being processed > */ > bool oob_initialized; > diff --git a/drivers/gpu/drm/xe/xe_guc.c b/drivers/gpu/drm/xe/xe_guc.c > index 9e34401e4489..433abc787f7b 100644 > --- a/drivers/gpu/drm/xe/xe_guc.c > +++ b/drivers/gpu/drm/xe/xe_guc.c > @@ -157,7 +157,7 @@ static bool needs_wa_dual_queue(struct xe_gt *gt) > * on RCS and CCSes with different address spaces, which on DG2 is > * required as a WA for an HW bug. > */ > - if (XE_WA(gt, 22011391025)) > + if (XE_GT_WA(gt, 22011391025)) > return true; > > /* > @@ -184,10 +184,10 @@ static u32 guc_ctl_wa_flags(struct xe_guc *guc) > struct xe_gt *gt = guc_to_gt(guc); > u32 flags = 0; > > - if (XE_WA(gt, 22012773006)) > + if (XE_GT_WA(gt, 22012773006)) > flags |= GUC_WA_POLLCS; > > - if (XE_WA(gt, 14014475959)) > + if (XE_GT_WA(gt, 14014475959)) > flags |= GUC_WA_HOLD_CCS_SWITCHOUT; > > if (needs_wa_dual_queue(gt)) > @@ -201,17 +201,17 @@ static u32 guc_ctl_wa_flags(struct xe_guc *guc) > if (GRAPHICS_VERx100(xe) < 1270) > flags |= GUC_WA_PRE_PARSER; > > - if (XE_WA(gt, 22012727170) || XE_WA(gt, 22012727685)) > + if (XE_GT_WA(gt, 22012727170) || XE_GT_WA(gt, 22012727685)) > flags |= GUC_WA_CONTEXT_ISOLATION; > > - if (XE_WA(gt, 18020744125) && > + if (XE_GT_WA(gt, 18020744125) && > !xe_hw_engine_mask_per_class(gt, XE_ENGINE_CLASS_RENDER)) > flags |= GUC_WA_RCS_REGS_IN_CCS_REGS_LIST; > > - if (XE_WA(gt, 1509372804)) > + if (XE_GT_WA(gt, 1509372804)) > flags |= GUC_WA_RENDER_RST_RC6_EXIT; > > - if (XE_WA(gt, 14018913170)) > + if (XE_GT_WA(gt, 14018913170)) > flags |= GUC_WA_ENABLE_TSC_CHECK_ON_RC6; > > return flags; > diff --git a/drivers/gpu/drm/xe/xe_guc_ads.c b/drivers/gpu/drm/xe/xe_guc_ads.c > index 8ff8626227ae..794cd1dc84c6 100644 > --- a/drivers/gpu/drm/xe/xe_guc_ads.c > +++ b/drivers/gpu/drm/xe/xe_guc_ads.c > @@ -247,7 +247,7 @@ static size_t calculate_regset_size(struct xe_gt *gt) > > count += ADS_REGSET_EXTRA_MAX * XE_NUM_HW_ENGINES; > > - if (XE_WA(gt, 1607983814)) > + if (XE_GT_WA(gt, 1607983814)) > count += LNCFCMOCS_REG_COUNT; > > return count * sizeof(struct guc_mmio_reg); > @@ -372,20 +372,20 @@ static void guc_waklv_init(struct xe_guc_ads *ads) > offset = guc_ads_waklv_offset(ads); > remain = guc_ads_waklv_size(ads); > > - if (XE_WA(gt, 14019882105) || XE_WA(gt, 16021333562)) > + if (XE_GT_WA(gt, 14019882105) || XE_GT_WA(gt, 16021333562)) > guc_waklv_enable_simple(ads, > GUC_WORKAROUND_KLV_BLOCK_INTERRUPTS_WHEN_MGSR_BLOCKED, > &offset, &remain); > - if (XE_WA(gt, 18024947630)) > + if (XE_GT_WA(gt, 18024947630)) > guc_waklv_enable_simple(ads, > GUC_WORKAROUND_KLV_ID_GAM_PFQ_SHADOW_TAIL_POLLING, > &offset, &remain); > - if (XE_WA(gt, 16022287689)) > + if (XE_GT_WA(gt, 16022287689)) > guc_waklv_enable_simple(ads, > GUC_WORKAROUND_KLV_ID_DISABLE_MTP_DURING_ASYNC_COMPUTE, > &offset, &remain); > > - if (XE_WA(gt, 14022866841)) > + if (XE_GT_WA(gt, 14022866841)) > guc_waklv_enable_simple(ads, > GUC_WA_KLV_WAKE_POWER_DOMAINS_FOR_OUTBOUND_MMIO, > &offset, &remain); > @@ -395,22 +395,22 @@ static void guc_waklv_init(struct xe_guc_ads *ads) > * the default value for this register is determined to be 0xC40. This could change in the > * future, so GuC depends on KMD to send it the correct value. > */ > - if (XE_WA(gt, 13011645652)) > + if (XE_GT_WA(gt, 13011645652)) > guc_waklv_enable_one_word(ads, > GUC_WA_KLV_NP_RD_WRITE_TO_CLEAR_RCSM_AT_CGP_LATE_RESTORE, > 0xC40, > &offset, &remain); > > - if (XE_WA(gt, 14022293748) || XE_WA(gt, 22019794406)) > + if (XE_GT_WA(gt, 14022293748) || XE_GT_WA(gt, 22019794406)) > guc_waklv_enable_simple(ads, > GUC_WORKAROUND_KLV_ID_BACK_TO_BACK_RCS_ENGINE_RESET, > &offset, &remain); > > - if (GUC_FIRMWARE_VER(>->uc.guc) >= MAKE_GUC_VER(70, 44, 0) && XE_WA(gt, 16026508708)) > + if (GUC_FIRMWARE_VER(>->uc.guc) >= MAKE_GUC_VER(70, 44, 0) && XE_GT_WA(gt, 16026508708)) > guc_waklv_enable_simple(ads, > GUC_WA_KLV_RESET_BB_STACK_PTR_ON_VF_SWITCH, > &offset, &remain); > - if (GUC_FIRMWARE_VER(>->uc.guc) >= MAKE_GUC_VER(70, 47, 0) && XE_WA(gt, 16026007364)) > + if (GUC_FIRMWARE_VER(>->uc.guc) >= MAKE_GUC_VER(70, 47, 0) && XE_GT_WA(gt, 16026007364)) > guc_waklv_enable_two_word(ads, > GUC_WA_KLV_RESTORE_UNSAVED_MEDIA_CONTROL_REG, > 0x0, > @@ -819,7 +819,7 @@ static unsigned int guc_mmio_regset_write(struct xe_guc_ads *ads, > guc_mmio_regset_write_one(ads, regset_map, e->reg, count++); > } > > - if (XE_WA(hwe->gt, 1607983814) && hwe->class == XE_ENGINE_CLASS_RENDER) { > + if (XE_GT_WA(hwe->gt, 1607983814) && hwe->class == XE_ENGINE_CLASS_RENDER) { > for (i = 0; i < LNCFCMOCS_REG_COUNT; i++) { > guc_mmio_regset_write_one(ads, regset_map, > XELP_LNCFCMOCS(i), count++); > diff --git a/drivers/gpu/drm/xe/xe_guc_pc.c b/drivers/gpu/drm/xe/xe_guc_pc.c > index 68b192fe3b32..0f8430acd16d 100644 > --- a/drivers/gpu/drm/xe/xe_guc_pc.c > +++ b/drivers/gpu/drm/xe/xe_guc_pc.c > @@ -722,7 +722,7 @@ static int xe_guc_pc_set_max_freq_locked(struct xe_guc_pc *pc, u32 freq) > */ > int xe_guc_pc_set_max_freq(struct xe_guc_pc *pc, u32 freq) > { > - if (XE_WA(pc_to_gt(pc), 22019338487)) { > + if (XE_GT_WA(pc_to_gt(pc), 22019338487)) { > if (wait_for_flush_complete(pc) != 0) > return -EAGAIN; > } > @@ -835,7 +835,7 @@ static u32 pc_max_freq_cap(struct xe_guc_pc *pc) > { > struct xe_gt *gt = pc_to_gt(pc); > > - if (XE_WA(gt, 22019338487)) { > + if (XE_GT_WA(gt, 22019338487)) { > if (xe_gt_is_media_type(gt)) > return min(LNL_MERT_FREQ_CAP, pc->rp0_freq); > else > @@ -899,7 +899,7 @@ static int pc_adjust_freq_bounds(struct xe_guc_pc *pc) > if (pc_get_min_freq(pc) > pc->rp0_freq) > ret = pc_set_min_freq(pc, pc->rp0_freq); > > - if (XE_WA(tile->primary_gt, 14022085890)) > + if (XE_GT_WA(tile->primary_gt, 14022085890)) > ret = pc_set_min_freq(pc, max(BMG_MIN_FREQ, pc_get_min_freq(pc))); > > out: > @@ -931,7 +931,7 @@ static bool needs_flush_freq_limit(struct xe_guc_pc *pc) > { > struct xe_gt *gt = pc_to_gt(pc); > > - return XE_WA(gt, 22019338487) && > + return XE_GT_WA(gt, 22019338487) && > pc->rp0_freq > BMG_MERT_FLUSH_FREQ_CAP; > } > > @@ -1017,7 +1017,7 @@ static int pc_set_mert_freq_cap(struct xe_guc_pc *pc) > { > int ret; > > - if (!XE_WA(pc_to_gt(pc), 22019338487)) > + if (!XE_GT_WA(pc_to_gt(pc), 22019338487)) > return 0; > > guard(mutex)(&pc->freq_lock); > diff --git a/drivers/gpu/drm/xe/xe_hw_engine.c b/drivers/gpu/drm/xe/xe_hw_engine.c > index 796ba8c34a16..1cf623b4a5bc 100644 > --- a/drivers/gpu/drm/xe/xe_hw_engine.c > +++ b/drivers/gpu/drm/xe/xe_hw_engine.c > @@ -576,7 +576,7 @@ static void adjust_idledly(struct xe_hw_engine *hwe) > u32 maxcnt_units_ns = 640; > bool inhibit_switch = 0; > > - if (!IS_SRIOV_VF(gt_to_xe(hwe->gt)) && XE_WA(gt, 16023105232)) { > + if (!IS_SRIOV_VF(gt_to_xe(hwe->gt)) && XE_GT_WA(gt, 16023105232)) { > idledly = xe_mmio_read32(>->mmio, RING_IDLEDLY(hwe->mmio_base)); > maxcnt = xe_mmio_read32(>->mmio, RING_PWRCTX_MAXCNT(hwe->mmio_base)); > > diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c > index 540f044bf425..7fe0e40ef3db 100644 > --- a/drivers/gpu/drm/xe/xe_lrc.c > +++ b/drivers/gpu/drm/xe/xe_lrc.c > @@ -76,7 +76,7 @@ lrc_to_xe(struct xe_lrc *lrc) > static bool > gt_engine_needs_indirect_ctx(struct xe_gt *gt, enum xe_engine_class class) > { > - if (XE_WA(gt, 16010904313) && > + if (XE_GT_WA(gt, 16010904313) && > (class == XE_ENGINE_CLASS_RENDER || > class == XE_ENGINE_CLASS_COMPUTE)) > return true; > @@ -1025,7 +1025,7 @@ static ssize_t setup_timestamp_wa(struct xe_lrc *lrc, struct xe_hw_engine *hwe, > const u32 ts_addr = __xe_lrc_ctx_timestamp_ggtt_addr(lrc); > u32 *cmd = batch; > > - if (!XE_WA(lrc->gt, 16010904313) || > + if (!XE_GT_WA(lrc->gt, 16010904313) || > !(hwe->class == XE_ENGINE_CLASS_RENDER || > hwe->class == XE_ENGINE_CLASS_COMPUTE || > hwe->class == XE_ENGINE_CLASS_COPY || > @@ -1062,7 +1062,7 @@ static ssize_t setup_invalidate_state_cache_wa(struct xe_lrc *lrc, > { > u32 *cmd = batch; > > - if (!XE_WA(lrc->gt, 18022495364) || > + if (!XE_GT_WA(lrc->gt, 18022495364) || > hwe->class != XE_ENGINE_CLASS_RENDER) > return 0; > > @@ -2004,7 +2004,7 @@ u32 *xe_lrc_emit_hwe_state_instructions(struct xe_exec_queue *q, u32 *cs) > * continue to emit all of the SVG state since it's best not to leak > * any of the state between contexts, even if that leakage is harmless. > */ > - if (XE_WA(gt, 14019789679) && q->hwe->class == XE_ENGINE_CLASS_RENDER) { > + if (XE_GT_WA(gt, 14019789679) && q->hwe->class == XE_ENGINE_CLASS_RENDER) { > state_table = xe_hpg_svg_state; > state_table_size = ARRAY_SIZE(xe_hpg_svg_state); > } > diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c > index 5729e7d3e335..a188bad172ad 100644 > --- a/drivers/gpu/drm/xe/xe_oa.c > +++ b/drivers/gpu/drm/xe/xe_oa.c > @@ -822,7 +822,7 @@ static void xe_oa_disable_metric_set(struct xe_oa_stream *stream) > u32 sqcnt1; > > /* Enable thread stall DOP gating and EU DOP gating. */ > - if (XE_WA(stream->gt, 1508761755)) { > + if (XE_GT_WA(stream->gt, 1508761755)) { > xe_gt_mcr_multicast_write(stream->gt, ROW_CHICKEN, > _MASKED_BIT_DISABLE(STALL_DOP_GATING_DISABLE)); > xe_gt_mcr_multicast_write(stream->gt, ROW_CHICKEN2, > @@ -1079,7 +1079,7 @@ static int xe_oa_enable_metric_set(struct xe_oa_stream *stream) > * EU NOA signals behave incorrectly if EU clock gating is enabled. > * Disable thread stall DOP gating and EU DOP gating. > */ > - if (XE_WA(stream->gt, 1508761755)) { > + if (XE_GT_WA(stream->gt, 1508761755)) { > xe_gt_mcr_multicast_write(stream->gt, ROW_CHICKEN, > _MASKED_BIT_ENABLE(STALL_DOP_GATING_DISABLE)); > xe_gt_mcr_multicast_write(stream->gt, ROW_CHICKEN2, > @@ -1754,7 +1754,7 @@ static int xe_oa_stream_init(struct xe_oa_stream *stream, > * GuC reset of engines causes OA to lose configuration > * state. Prevent this by overriding GUCRC mode. > */ > - if (XE_WA(stream->gt, 1509372804)) { > + if (XE_GT_WA(stream->gt, 1509372804)) { > ret = xe_guc_pc_override_gucrc_mode(>->uc.guc.pc, > SLPC_GUCRC_MODE_GUCRC_NO_RC6); > if (ret) > @@ -1886,7 +1886,7 @@ u32 xe_oa_timestamp_frequency(struct xe_gt *gt) > { > u32 reg, shift; > > - if (XE_WA(gt, 18013179988) || XE_WA(gt, 14015568240)) { > + if (XE_GT_WA(gt, 18013179988) || XE_GT_WA(gt, 14015568240)) { > xe_pm_runtime_get(gt_to_xe(gt)); > reg = xe_mmio_read32(>->mmio, RPM_CONFIG0); > xe_pm_runtime_put(gt_to_xe(gt)); > diff --git a/drivers/gpu/drm/xe/xe_query.c b/drivers/gpu/drm/xe/xe_query.c > index 44d44bbc71dc..4dbe5732cb7f 100644 > --- a/drivers/gpu/drm/xe/xe_query.c > +++ b/drivers/gpu/drm/xe/xe_query.c > @@ -477,7 +477,7 @@ static size_t calc_topo_query_size(struct xe_device *xe) > sizeof_field(struct xe_gt, fuse_topo.eu_mask_per_dss); > > /* L3bank mask may not be available for some GTs */ > - if (!XE_WA(gt, no_media_l3)) > + if (!XE_GT_WA(gt, no_media_l3)) > query_size += sizeof(struct drm_xe_query_topology_mask) + > sizeof_field(struct xe_gt, fuse_topo.l3_bank_mask); > } > @@ -540,7 +540,7 @@ static int query_gt_topology(struct xe_device *xe, > * mask, then it's better to omit L3 from the query rather than > * reporting bogus or zeroed information to userspace. > */ > - if (!XE_WA(gt, no_media_l3)) { > + if (!XE_GT_WA(gt, no_media_l3)) { > topo.type = DRM_XE_TOPO_L3_BANK; > err = copy_mask(&query_ptr, &topo, gt->fuse_topo.l3_bank_mask, > sizeof(gt->fuse_topo.l3_bank_mask)); > diff --git a/drivers/gpu/drm/xe/xe_ring_ops.c b/drivers/gpu/drm/xe/xe_ring_ops.c > index e8f22ec5f9af..5f15360d14bf 100644 > --- a/drivers/gpu/drm/xe/xe_ring_ops.c > +++ b/drivers/gpu/drm/xe/xe_ring_ops.c > @@ -179,7 +179,7 @@ static int emit_render_cache_flush(struct xe_sched_job *job, u32 *dw, int i) > bool lacks_render = !(gt->info.engine_mask & XE_HW_ENGINE_RCS_MASK); > u32 flags; > > - if (XE_WA(gt, 14016712196)) > + if (XE_GT_WA(gt, 14016712196)) > i = emit_pipe_control(dw, i, 0, PIPE_CONTROL_DEPTH_CACHE_FLUSH, > LRC_PPHWSP_FLUSH_INVAL_SCRATCH_ADDR, 0); > > @@ -190,7 +190,7 @@ static int emit_render_cache_flush(struct xe_sched_job *job, u32 *dw, int i) > PIPE_CONTROL_DC_FLUSH_ENABLE | > PIPE_CONTROL_FLUSH_ENABLE); > > - if (XE_WA(gt, 1409600907)) > + if (XE_GT_WA(gt, 1409600907)) > flags |= PIPE_CONTROL_DEPTH_STALL; > > if (lacks_render) > @@ -206,7 +206,7 @@ static int emit_pipe_control_to_ring_end(struct xe_hw_engine *hwe, u32 *dw, int > if (hwe->class != XE_ENGINE_CLASS_RENDER) > return i; > > - if (XE_WA(hwe->gt, 16020292621)) > + if (XE_GT_WA(hwe->gt, 16020292621)) > i = emit_pipe_control(dw, i, 0, PIPE_CONTROL_LRI_POST_SYNC, > RING_NOPID(hwe->mmio_base).addr, 0); > > diff --git a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c > index 9a9733447230..dc588255674d 100644 > --- a/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c > +++ b/drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c > @@ -166,7 +166,7 @@ static u32 detect_bar2_integrated(struct xe_device *xe, struct xe_ttm_stolen_mgr > > stolen_size -= wopcm_size; > > - if (media_gt && XE_WA(media_gt, 14019821291)) { > + if (media_gt && XE_GT_WA(media_gt, 14019821291)) { > u64 gscpsmi_base = xe_mmio_read64_2x32(&media_gt->mmio, GSCPSMI_BASE) > & ~GENMASK_ULL(5, 0); > > diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c > index 432ea325677d..148a2425006f 100644 > --- a/drivers/gpu/drm/xe/xe_vm.c > +++ b/drivers/gpu/drm/xe/xe_vm.c > @@ -2068,7 +2068,7 @@ int xe_vm_create_ioctl(struct drm_device *dev, void *data, > if (XE_IOCTL_DBG(xe, args->extensions)) > return -EINVAL; > > - if (XE_WA(xe_root_mmio_gt(xe), 14016763929)) > + if (XE_GT_WA(xe_root_mmio_gt(xe), 14016763929)) > args->flags |= DRM_XE_VM_CREATE_FLAG_SCRATCH_PAGE; > > if (XE_IOCTL_DBG(xe, args->flags & DRM_XE_VM_CREATE_FLAG_FAULT_MODE && > diff --git a/drivers/gpu/drm/xe/xe_wa.c b/drivers/gpu/drm/xe/xe_wa.c > index 22a98600fd8f..154c0e50cc3c 100644 > --- a/drivers/gpu/drm/xe/xe_wa.c > +++ b/drivers/gpu/drm/xe/xe_wa.c > @@ -1079,6 +1079,6 @@ void xe_wa_apply_tile_workarounds(struct xe_tile *tile) > if (IS_SRIOV_VF(tile->xe)) > return; > > - if (XE_WA(tile->primary_gt, 22010954014)) > + if (XE_GT_WA(tile->primary_gt, 22010954014)) > xe_mmio_rmw32(mmio, XEHP_CLOCK_GATE_DIS, 0, SGSI_SIDECLK_DIS); > } > diff --git a/drivers/gpu/drm/xe/xe_wa.h b/drivers/gpu/drm/xe/xe_wa.h > index f3880c65cb8d..4c3163eeda0d 100644 > --- a/drivers/gpu/drm/xe/xe_wa.h > +++ b/drivers/gpu/drm/xe/xe_wa.h > @@ -25,11 +25,11 @@ void xe_wa_device_dump(struct xe_device *xe, struct drm_printer *p); > void xe_wa_dump(struct xe_gt *gt, struct drm_printer *p); > > /** > - * XE_WA - Out-of-band workarounds, to be queried and called as needed. > + * XE_GT_WA - Out-of-band workarounds, to be queried and called as needed. Out-of-band GT workarounds And also please rename the functions that are related to gt only and which the device is in place. i.e.: - int xe_wa_init(struct xe_gt *gt); + xe_wa_gt_init - void xe_wa_process_oob(struct xe_gt *gt); + xe_wa_process_gt_oob the rest of the patch looks good. The functions can be in a separate patch if you prefer > * @gt__: gt instance > * @id__: XE_OOB_, as generated by build system in generated/xe_wa_oob.h > */ > -#define XE_WA(gt__, id__) ({ \ > +#define XE_GT_WA(gt__, id__) ({ \ > xe_gt_assert(gt__, (gt__)->wa_active.oob_initialized); \ > test_bit(XE_WA_OOB_ ## id__, (gt__)->wa_active.oob); \ > }) > -- > 2.49.0 >