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 3431DE7D0C2 for ; Fri, 22 Sep 2023 04:04:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 32E1110E622; Fri, 22 Sep 2023 04:04:53 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6941310E622 for ; Fri, 22 Sep 2023 04:04:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695355491; x=1726891491; h=message-id:date:subject:to:references:from:in-reply-to: mime-version; bh=Gk1aN5BNeF8AFL0pi5VGsJo42mhBOz8K2duWEJLI1us=; b=Rjr9nmb0y2lh2CfltNi/4Z8iBsVo4XHEU29gFTk2WFyl2tN9ImP9UwiJ fA+J+ExUgqoWYyAc83zezVFQ6jYo1DF/Nq1pBrc8RjDLmlA5TPnivZ384 4auQ3Q9+uuIjxyK/8rDQZMMkOiN7Q1C89i09fAkIyjQM5Khp5mFBNEXXW ETH43/iJE/gYFjv3tQR+IP9xK8+fkUBmo6LDEhV0fdmT+qibPjYP78XdH NnX6AaqonTWSSTpAUyzOSXabNnf59tn5nsb9nAuGirBa8V8OyrNqceMX6 vWZ+4nnV4pIGB1/TVrakaaGhzVk0lI62sX6i9FsKmhW3YMEdj9pYbcSSQ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10840"; a="467036360" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208,217";a="467036360" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Sep 2023 21:04:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10840"; a="750693752" X-IronPort-AV: E=Sophos;i="6.03,167,1694761200"; d="scan'208,217";a="750693752" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga007.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 21 Sep 2023 21:04:50 -0700 Received: from orsmsx610.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.32; Thu, 21 Sep 2023 21:04:49 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.32 via Frontend Transport; Thu, 21 Sep 2023 21:04:49 -0700 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.47) 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.32; Thu, 21 Sep 2023 21:04:49 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QBCd2zVoIhQzXouJoFl+LIVql4p2Z7GMQIuG80RfB/zVuL3TtSQ0OI/O93Yp8dOiqN13X3oIhnzNLy5VuK8evfe5agYSOK7pL/caYLc/hI3U9XkDeEDwvH0wY2F1cq2eXg4vlaGlO98EFXFnJnfhsiI7GXZOgOyvYVeU05awVtSAfW2rM/61JukJ9GB/LTpbp8QOjiQpH9EdqieoTZokWgMZq2TvSGrzUXX+wCGF61GQkadzRFSahWqfNp23VKm3bl/yNXOcsrCMFJJXYtbwibVL7rMimMg+yew93ppmPnZcj88Iwutdh4GeEQneYnzGNs6zbeMV2q6lrrP3j7JC6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=4UTlDroj4hEJ1gnssfcGE+ct9h9Zb/CDaPNxhA7ZfmE=; b=h85TezsMLCmPtz3y3/Wf+M+Fj0XxOpgsnANCvuT2gpEtWItuMJ6N+UUAmuh8JF8dcPY2th3yOzJb/ClXB8wcAmCmQpu/9OxqaLvHlqW6dJuTFo1wyVUHFa7b0TVkUdMPuPwewRcd56jvVE3+XT6KC63Aqt11MZ3+dgm8OhEhrxtcFQd3ODrPs3lONZW614DSukDKsYOiQGeHYnRZ2o/8jfqHkrOvdlyg7sBEo3zkfNzaYb3NDM8UbMhs0lRD1rAyOHT/n9XVZncYAY1c5pGz/o76cuu3v3057Jl5XAqvEP8Mo7W5a6TvIMbHsO1+Lmy7yNRzvttQnijZ3GXQYIjUwg== 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 LV8PR11MB8607.namprd11.prod.outlook.com (2603:10b6:408:1ec::18) by DM4PR11MB7181.namprd11.prod.outlook.com (2603:10b6:8:113::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.30; Fri, 22 Sep 2023 04:04:46 +0000 Received: from LV8PR11MB8607.namprd11.prod.outlook.com ([fe80::14e:2981:12e1:e3e7]) by LV8PR11MB8607.namprd11.prod.outlook.com ([fe80::14e:2981:12e1:e3e7%5]) with mapi id 15.20.6813.017; Fri, 22 Sep 2023 04:04:46 +0000 Content-Type: multipart/alternative; boundary="------------bt4BMW80esAjv04yPlv60nod" Message-ID: <5e2c29a6-083e-4f84-932e-a14fed53086c@intel.com> Date: Fri, 22 Sep 2023 09:34:36 +0530 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Gustavo Sousa , , References: <20230921143028.483008-1-shekhar.chauhan@intel.com> <169533011276.1903.10121233791745587247@gjsousa-mobl2> From: "Chauhan, Shekhar" In-Reply-To: <169533011276.1903.10121233791745587247@gjsousa-mobl2> X-ClientProxiedBy: PN2PR01CA0015.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:25::20) To LV8PR11MB8607.namprd11.prod.outlook.com (2603:10b6:408:1ec::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LV8PR11MB8607:EE_|DM4PR11MB7181:EE_ X-MS-Office365-Filtering-Correlation-Id: ffeea8cd-c33c-44f7-98b9-08dbbb210e75 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7d2wH8ZxBmBCepMOnjUb7Ela6HHAqo5zQSqHZRLaTXNgp/NjqLmvIq8i3fg4H7jMQ2FHBR04RMb/+GfgOdb69NWntUDp1S3cwkZ1UzOQPsJMtrhx9wsJoZuFiXsZuNZae9LbZmGGG661KKDl8z7xoIBOsqscRKhiEY8yNPkyemqXkDFpAWGl5aWVHOhMws9EgngFyKpslL4OvZjpJ2J4miXQnZ7zTJfcYTxVeqQa5NMy24gT1uXvFRygweO3Ocvlxu7hIQcJTsfkd6qqJvZO2rzp69yIb7ShFTMa2co7xjyCBljC/Ky7S8rMSRLNDLNFqnpI3fla8pAfOz42DTbtkRrU7dYerroEwpiwiHC9qo9OKfkJIH8Xvi8D3JchCS4LYt5+gHNoepdjNDMiT424HjnfuesxNEmnAzgdhnCjqLtnzGYPsEyfCYTuA2fqs4rsxTsVEn2Q5u/xePlnsxk8ijrMubmPGnGIk1nsQHcoebYPHqfcxnOoYuhQGGSqD7BdRYxqXVNZ0Y1m6i1F7W7pcwHFgkuARvUDevPIwM6xSuvXxGrRI9g+MvftvAVSBLduXlnu6+wpux4GBvJjvzLzHiGDBp7xgeqPkfjKSqquOoY/MxRHtfOQ/DE2ckXVT9hW9HwzLb7Lhqyq1XxVOMOqvWfcp9fsNKQZSV0ie972rFWo0E9PMpltUdc03YV87nwvG5aoFJiYepGJdKc/ZMf6GGv1kGdDOkH0ZTOuJO3S5K9ivvWqwUlPYU6gKD6qMtWtjfzE5s0G1/pyV9JuNPmtEw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:LV8PR11MB8607.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39860400002)(136003)(376002)(346002)(366004)(396003)(451199024)(186009)(1800799009)(31686004)(53546011)(6486002)(6666004)(6506007)(40265005)(478600001)(966005)(33964004)(82960400001)(166002)(38100700002)(86362001)(36756003)(31696002)(2616005)(26005)(6512007)(2906002)(5660300002)(83380400001)(8936002)(8676002)(66946007)(41300700001)(66476007)(66556008)(6636002)(316002)(45980500001)(43740500002)(579004); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?U1Y3Uk1rV3F0aGc0S0hPOFR2NE14SUFYUndBaU9qNnI5RGZtSVpwd1hyemcr?= =?utf-8?B?MHpUWGtDMWpWVE9GNVJ1L0VqOTlPZkdhUkIxa3dBQmtSekNhbVdXYWcyQWZm?= =?utf-8?B?aG1WeURKaEpCZzg5VWFiaU01TDhaQW94WHRKYjFUMkxxZFBDOGl5b3VFRzNs?= =?utf-8?B?eG5LN0taSjd1OEJveFFwc2d3RXE4T295RmlBRE13YlMvL2JCWlBpdkYvNHU3?= =?utf-8?B?cXNEMWhWWGc4dmdHRjZMbUNiOStEQXhKQ1NRMnFndXh5TnB3dHRWazNKbFdn?= =?utf-8?B?RWdUY21PbTNJSVJsR3JqMDlIcmF6VHc4STVBWTR3NGRodm9OYTNWMVZzY3k2?= =?utf-8?B?ZDV1bUtkNjUza3NJdTh2eGdtVHgwYURuOVpiSGxYOEJoNVVKdTRPQ0Nkc2Nx?= =?utf-8?B?S3BNbWo2UVZmc3V6dUlHLzNVRGcvU3RDVlg0eWFRZkhPRWVBTDRGOWY2MDlB?= =?utf-8?B?TWhkZlBWaU9WdFV5dlVGQkxsUVUrSzF5U3M1NnBrSnNTSjZoTFZwRy9nbmhO?= =?utf-8?B?b0JoTnIyOEwxcDV1NXQvRUpDeGVLQUt6Y2hKMWpldnRHc1hBdW0xbXF3aTVi?= =?utf-8?B?UVpNbXBOMWVjMlByVGJ2cHdsQWZ1aHp4SjZZTTFKVVAyUUo1RkZpM3ZVWHhG?= =?utf-8?B?cURmbnQwRFJrMkQ1UGdQTlNDNXhURkxLTUl3UWJkY2Y0akdUQ0Y4c2VrZW10?= =?utf-8?B?RmJhc0VLTW12aWE0TW1OVzBGMzFDcVhFS3dCYkRweGxmR1RnL0F5eGwxR3Ra?= =?utf-8?B?bW15QXBLZmhPK2RGWjQ3UkQvbjR0dUFXUTV5dVNENThZZmo5TWRDTmtibmYx?= =?utf-8?B?OERYdUxpMmZWMzJheUVycGJkVGVIOEwwVFZibzdsWU9LZHA2dTREZUZudzhq?= =?utf-8?B?Y1hLNXk2bHV4NllyWVZFKzlHc0VROE9OQmdtL05WN2ZEQ09lTm5rQ3NiOEdp?= =?utf-8?B?NFBzeVZmK3VUVHZyU2NNUXZEMFNPcG9nUko1R3RyYjRVcHZ5Vi8rNFdiSmpP?= =?utf-8?B?TUN6UzNEdHBVTGJVR3FRSEF1MFRwTHZWS3hack9oK3k0NkJTdWxiMzZoS09S?= =?utf-8?B?aWkrUFB6OWEvTWxCa29idlF5Njc5OFlSSGtQQVladjRKZml1WUFBQVJuOHJP?= =?utf-8?B?NGtpcVp3VVgzWkZ1R29NeXpNREdjQmY4V0JIQm5lSklhR2k3bm5KWWpTdHlV?= =?utf-8?B?VU9vNVRCSU1GQ0pjd3k0RXczV1M1VDRqT3VEMkcrdUJaaHVQL21FT3pSRlZO?= =?utf-8?B?VmRpb2J5VSt2cElaRklLbndTRnBWQlZXTENUOTZYUU9aR0ZJalg1M1FqeDY3?= =?utf-8?B?aHRGTnl0Q1NOazl5WVkzYkgxdzB6SjYzT0oyblRYVFZEM25uTjlCWXpyVG1R?= =?utf-8?B?MnZwQlhxMk5NR1JVNkZKOEF2UEZLQkRmeFM1eHhyQ1pvTnBuaHhZZCt3bGZL?= =?utf-8?B?UWhTallqQ2w3YWRvZGlMK1RqVFBQM0ZIRW1WViswMGN2Mjg2N1Y0S3MwenhH?= =?utf-8?B?MVN5b0QxOGFKSVFkN1ZuWW12U2Jmei9rK2FQL3BOWnMycE82M0lyOW55b052?= =?utf-8?B?dS9KbVlUV3EzZXNMNlVMZXBJTkltMmVVYzErNnNYTTVZaHBZcHM4SVlyeFk0?= =?utf-8?B?YlpDZkZKQUVNaWNqazlhVm5HU3B1bUdyaXNKY2Uyb1AzUmFoZW04QmtXZUJC?= =?utf-8?B?OFB1TTFrbC9kVTFBV2lSWk9EcVprcWJjcGYwYW9GTXRmYmFCTFluZFJneFd5?= =?utf-8?B?dVhveDM2UFB6SXc0eThCQSt6ZGtmNy9TdlMxWTZUQ0hzVVArOE1nMEhucTVX?= =?utf-8?B?Tlczd1IybFpVNkhadThsdUpLeGJWODRqRTZzUFcyWUpsSXVFbncxa2dLdzNz?= =?utf-8?B?bW9ZQXZxU09QdWxtQUlmRjUyMHZPM2xBeTJ5am9HS1JvamVTSTFaRkYycnhY?= =?utf-8?B?WE1vWi93MW9wdlhPYWUxUGJpRzVFNkRwRkRMN2lYQXBxYTROWW9ZWllYaFJ4?= =?utf-8?B?NHYzMTNmRlRjTWNaNW4xNDB0RUlRZ2R0QW4vTFd2Uk11VjZKTlVVQVlORXJO?= =?utf-8?B?T1U1WWMzaWFMTkozZUd5dmdNMVRmWkd3a2J6WjNhaHZuS25PYTFRWkJiSW8x?= =?utf-8?B?QWZJZHBVazVwellNSElpQ2src253djhVeUxTU01zQjJJQUIxczRnWmw1elov?= =?utf-8?B?R0E9PQ==?= X-MS-Exchange-CrossTenant-Network-Message-Id: ffeea8cd-c33c-44f7-98b9-08dbbb210e75 X-MS-Exchange-CrossTenant-AuthSource: LV8PR11MB8607.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Sep 2023 04:04:45.6922 (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: ebro9jFosjN6XBnKvvnurmRqPFHCnQreaeqnrKa/znesg9UFXzLaAEj0KG1Tr2ilCzSv3dMeTsV/vyZHC8H56fhmi5lR47Ls5+ENX5LFlrs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB7181 X-OriginatorOrg: intel.com Subject: Re: [Intel-gfx] [PATCH] drm/i915: Add Wa_18028616096 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" --------------bt4BMW80esAjv04yPlv60nod Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit Quoting Gustavo Sousa: On 9/22/2023 02:31, Gustavo Sousa wrote: > Quoting Shekhar Chauhan (2023-09-21 11:30:28-03:00) >> Drop UGM per set fragment threshold to 3 >> >> BSpec: 54833 >> Signed-off-by: Shekhar Chauhan >> --- >> drivers/gpu/drm/i915/gt/intel_gt_regs.h | 1 + >> drivers/gpu/drm/i915/gt/intel_workarounds.c | 3 +++ >> 2 files changed, 4 insertions(+) >> >> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h >> index a00ff51c681d..431c575c532b 100644 >> --- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h >> +++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h >> @@ -1230,6 +1230,7 @@ >> #define DISABLE_D8_D16_COASLESCE REG_BIT(30) >> #define FORCE_1_SUB_MESSAGE_PER_FRAGMENT REG_BIT(15) >> #define LSC_CHICKEN_BIT_0_UDW MCR_REG(0xe7c8 + 4) >> +#define UGM_FRAGMENT_THRESHOLD_TO_3 REG_BIT(58 - 32) >> #define DIS_CHAIN_2XSIMD8 REG_BIT(55 - 32) >> #define FORCE_SLM_FENCE_SCOPE_TO_TILE REG_BIT(42 - 32) >> #define FORCE_UGM_FENCE_SCOPE_TO_TILE REG_BIT(41 - 32) >> diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c >> index 660d4f358eab..992041e3776c 100644 >> --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c >> +++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c >> @@ -2914,6 +2914,9 @@ general_render_compute_wa_init(struct intel_engine_cs *engine, struct i915_wa_li >> * Wa_22015475538:dg2 >> */ >> wa_mcr_write_or(wal, LSC_CHICKEN_BIT_0_UDW, DIS_CHAIN_2XSIMD8); >> + >> + /* Wa_18028616096:dg2 */ > This is not a blocker, but I would prefer to remove the ":dg2" suffix. > > There was an effort to remove them from our driver[1], but it kinda of > stalled. I myself agree that we would be better off without them. > > [1]https://lore.kernel.org/all/20221222082557.1364711-1-lucas.demarchi@intel.com Ack'ed in the new version. > >> + wa_mcr_write_or(wal, LSC_CHICKEN_BIT_0_UDW, UGM_FRAGMENT_THRESHOLD_TO_3); > This workaround applies to (i) DG2 G10 from stepping C0 to forever and > (ii) any stepping of DG2 G12. Here you are applying this workaround to > any variant of DG2. > > It should be moved out of this "if" statement and rather be guarded by > something like: > > if ((IS_DG2_G10(i915) && IS_GRAPHICS_STEP(i915, STEP_C0, STEP_FOREVER)) || > IS_DG2_G12(i915)) > > Note that we are there is still a pending decision for G11, so we may > need to update this in the future. I believe we're only supporting production steppings for DG2, henceforth, not really interacting with the "older" steppings. Please have a look: https://lore.kernel.org/intel-gfx/20230816214201.534095-7-matthew.d.roper@intel.com/ Although, I could be wrong, if I am, I'll send in another version, modifying the patch as you've suggested. > -- > Gustavo Sousa > >> } >> >> if (IS_DG2_G11(i915)) { >> -- >> 2.34.1 >> -- -shekhar --------------bt4BMW80esAjv04yPlv60nod Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: 7bit

Quoting Gustavo Sousa:

On 9/22/2023 02:31, Gustavo Sousa wrote:
Quoting Shekhar Chauhan (2023-09-21 11:30:28-03:00)

Drop UGM per set fragment threshold to 3

BSpec: 54833
Signed-off-by: Shekhar Chauhan <shekhar.chauhan@intel.com>
---
drivers/gpu/drm/i915/gt/intel_gt_regs.h     | 1 +
drivers/gpu/drm/i915/gt/intel_workarounds.c | 3 +++
2 files changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/i915/gt/intel_gt_regs.h b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
index a00ff51c681d..431c575c532b 100644
--- a/drivers/gpu/drm/i915/gt/intel_gt_regs.h
+++ b/drivers/gpu/drm/i915/gt/intel_gt_regs.h
@@ -1230,6 +1230,7 @@
#define   DISABLE_D8_D16_COASLESCE                REG_BIT(30)
#define   FORCE_1_SUB_MESSAGE_PER_FRAGMENT        REG_BIT(15)
#define LSC_CHICKEN_BIT_0_UDW                        MCR_REG(0xe7c8 + 4)
+#define   UGM_FRAGMENT_THRESHOLD_TO_3                REG_BIT(58 - 32)
#define   DIS_CHAIN_2XSIMD8                        REG_BIT(55 - 32)
#define   FORCE_SLM_FENCE_SCOPE_TO_TILE                REG_BIT(42 - 32)
#define   FORCE_UGM_FENCE_SCOPE_TO_TILE                REG_BIT(41 - 32)
diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
index 660d4f358eab..992041e3776c 100644
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
@@ -2914,6 +2914,9 @@ general_render_compute_wa_init(struct intel_engine_cs *engine, struct i915_wa_li
                 * Wa_22015475538:dg2
                 */
                wa_mcr_write_or(wal, LSC_CHICKEN_BIT_0_UDW, DIS_CHAIN_2XSIMD8);
+
+                /* Wa_18028616096:dg2 */

This is not a blocker, but I would prefer to remove the ":dg2" suffix.

There was an effort to remove them from our driver[1], but it kinda of
stalled. I myself agree that we would be better off without them.

[1] https://lore.kernel.org/all/20221222082557.1364711-1-lucas.demarchi@intel.com
Ack'ed in the new version.


+                wa_mcr_write_or(wal, LSC_CHICKEN_BIT_0_UDW, UGM_FRAGMENT_THRESHOLD_TO_3);

This workaround applies to (i) DG2 G10 from stepping C0 to forever and
(ii) any stepping of DG2 G12. Here you are applying this workaround to
any variant of DG2.

It should be moved out of this "if" statement and rather be guarded by
something like:

	if ((IS_DG2_G10(i915) && IS_GRAPHICS_STEP(i915, STEP_C0, STEP_FOREVER)) ||
	    IS_DG2_G12(i915))

Note that we are there is still a pending decision for G11, so we may
need to update this in the future.

I believe we're only supporting production steppings for DG2, henceforth, not really interacting with the "older" steppings.

Please have a look:

https://lore.kernel.org/intel-gfx/20230816214201.534095-7-matthew.d.roper@intel.com/

Although, I could be wrong, if I am, I'll send in another version, modifying the patch as you've suggested.

--
Gustavo Sousa


        }

        if (IS_DG2_G11(i915)) {
-- 
2.34.1


-- 
-shekhar
--------------bt4BMW80esAjv04yPlv60nod--