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 3E486C25B75 for ; Thu, 6 Jun 2024 15:44:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A560410E9C7; Thu, 6 Jun 2024 15:44:53 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Z7upxq6V"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id E71A410E9C7 for ; Thu, 6 Jun 2024 15:44: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=1717688692; x=1749224692; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=rrD0HSlw+7+9OwvfoyjBM3TWx1sU6UE8xRzl6LWUaK0=; b=Z7upxq6Vv0/6JwvP3Oz/lbwmzWHuEjyKOHHK8Tgoiyw5SYnzD1Zo9uRt 81sp7T4UGl8l7HGt9Mpw0YdOu4m6h4jorrqa7QRQAiDvb/4IAjKluYlQM nhxtKqfMUjWx6AOhNI8nsvfmTqAiaxK6QHtDIGB1FdqSYQrAmgiOaec1O //MuxR1gYTJv7ecYJ8WTCmmnXB8Z4O614GM4l21GCKbEutxCcG83PjJxT yD1cw13YRpYC2rPKF36tyugPvX+0F+CONCDPa43OslBch1bfqRoI0rWc5 ueo8RC0y743tfTmO+Tdu8mCvTu0sBdFi+hRWE77kILrvLBfB1SpmC/prH g==; X-CSE-ConnectionGUID: 4nSbN3IeQ0akT59ygvRWwA== X-CSE-MsgGUID: 5kqrUCIzSp6F7Hu5boLqyQ== X-IronPort-AV: E=McAfee;i="6600,9927,11095"; a="14108902" X-IronPort-AV: E=Sophos;i="6.08,219,1712646000"; d="scan'208";a="14108902" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jun 2024 08:44:52 -0700 X-CSE-ConnectionGUID: G51nSOiqTlCxn6D0zGmAaA== X-CSE-MsgGUID: KYauWeQcTgyzrCEh8SmL+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,219,1712646000"; d="scan'208";a="38127112" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmviesa009.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 06 Jun 2024 08:44:52 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Thu, 6 Jun 2024 08:44:51 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39 via Frontend Transport; Thu, 6 Jun 2024 08:44:51 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.101) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Thu, 6 Jun 2024 08:44:51 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WoH3KoPU69bky0cRu9FM0yRk1FM5ghZihNkDwy9KGnzAF5fLlRo4CVS4xf22kfWJsM4NXOJhrxgNg42J2GFMIxC31iRyxfA6w71qT1krROmQo5kEIcDzI9guIYYmCG7W0J8pqfJSbs8nffvUwz7xCQMA1eyT9hbmsc6FT18ifHsZHeFElGylNa8b+lRgmu3uKtna+RX32TUtMFCFi69S0tQxBdvaVSoO6ptztMXL4MbSTd7EGTGZyhDiiA2iItDtAJDQ4+ucwgcxcBwUkEL3siqWHEkIr1OIfhsrmYetoM5v3vfOYJMGboQneZEINGPet+2Xwh9V/DOU9k9dYrA48Q== 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=3JeF9AYw1mpAkeSFyMbGFco0e6A+B70fDhwhc3T2UIk=; b=c+GFuF1U0hoBtBHdFMK5nVcBcvODngHp7wl2Q62XGEPf34MOkUL8S/wxGq1jXkaoF5YwBUIdjyrD0LRf23ere7XSCaJhalRJtihcplb2/kpv7LFx/tpYgTY90fl9i2dbhlc36Qwc0sTWm+t3vnvdCX5gDH6ylHl9olcKfKE5N8HuptzXukteNtrzc6cExDaixbACF/vL5UQaVWR+znAX1/Cdm//OwgzmFwM51h8ap/8resLiMgIS5T3Mx8xzfCqgQL6j82cWlr6c9Hxf5amgL+lcWyAVuMXPYsqtxfPjWZtkeu2cpYlmirWl5p+/4bA5XhJQNWTtQlrvsmyLZzrwuA== 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 BYAPR11MB2854.namprd11.prod.outlook.com (2603:10b6:a02:c9::12) by SJ2PR11MB8404.namprd11.prod.outlook.com (2603:10b6:a03:53f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.34; Thu, 6 Jun 2024 15:44:44 +0000 Received: from BYAPR11MB2854.namprd11.prod.outlook.com ([fe80::8a98:4745:7147:ed42]) by BYAPR11MB2854.namprd11.prod.outlook.com ([fe80::8a98:4745:7147:ed42%5]) with mapi id 15.20.7633.033; Thu, 6 Jun 2024 15:44:44 +0000 Date: Thu, 6 Jun 2024 11:44:41 -0400 From: Rodrigo Vivi To: Jani Nikula CC: Subject: Re: [PATCH 24/65] drm/i915: pass dev_priv explicitly to ICL_PIPESTATUS Message-ID: References: Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: X-ClientProxiedBy: BYAPR21CA0024.namprd21.prod.outlook.com (2603:10b6:a03:114::34) To BYAPR11MB2854.namprd11.prod.outlook.com (2603:10b6:a02:c9::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BYAPR11MB2854:EE_|SJ2PR11MB8404:EE_ X-MS-Office365-Filtering-Correlation-Id: 1220ea58-a426-4a09-a6c6-08dc863f9611 X-LD-Processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230031|376005|1800799015|366007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?8+ByWNn+y/d6fFna4YHe/0gau3Y3/Wmzh3csNTX55lIQaLAC9++CWzwbLqk0?= =?us-ascii?Q?IrExtUeYIHpiqhx5nNQWk8XRMiX0M9Tb7yMzTq73CNWLL44O4HLCc9r3kfUb?= =?us-ascii?Q?NONRpuQwaarbjR7HJ4BHiuIhqfhuPrNCMS/lewLeXwPOMKgrEAFiyoSpRlCN?= =?us-ascii?Q?uD6+oi5WaXsqXblLDtEl5jOComgCn3B5JlwlCetat8vBJnox+q5fa9gF7dbu?= =?us-ascii?Q?AY/e/+tFAYBC5Qqn3R0pi51rwn42Vp4ogC705r4R6OQP3iF+vuU8obe5/IuG?= =?us-ascii?Q?UVRmeAovHi9UygqBWcUF8ggaQTQoQZpP9xDL2VpBTt6WZgE0X3woqA4Uzb1v?= =?us-ascii?Q?xLJRbcpQb2gZH3rmCJ19rq58QtyVAd6k27MJwEbC7f1fcTrR/eEfVLmHkAuz?= =?us-ascii?Q?OWBmRxSIXXShrZGb9hZmpyJbo2RO+Qy127OJ3PD87/VNXCPIwaRMLI04DtI1?= =?us-ascii?Q?jcbSYfBkwjefMsA21TzVOXxW8t6ZXsbnEOtaa7Vvzc+dIWcJNFqWr5M2zfe9?= =?us-ascii?Q?UvoCct8WywUWpP59NZs5LhF7MyQiLlRDGOReHUvcT+xWI2liLS3lxpw/AgsJ?= =?us-ascii?Q?NqUlcBgTaXRBno7np0v7fvBepZBlZ5zpAd/ikT1HTNpvUU2Y5VhdO8YvMPlE?= =?us-ascii?Q?zG66S6C+ETf/wN0ALH7m9GZkHjiFdzhQvy9tUbF0kvjnloq4VTRRdFAzC/Gc?= =?us-ascii?Q?bgJcNcb+mRm1oRIzKkwUeUNNR0uLpkQ8781/aRskUVSYEh//zapa+FuODcZH?= =?us-ascii?Q?A7tyf66Fgj8H30xvkI6tEwu0aG4zQXpe2goIm0xAvYO8EhRipTo2c8wz2Oa3?= =?us-ascii?Q?py5DcrqJFBM2z1hPreEaRLobYj5YzpGR0Tla0qgc9kBqzW6G9ND7QEnmqqhA?= =?us-ascii?Q?IMEBW1njEPeqrgTqGcrCkDyer8MkYMcsMqjcSJTqEfnInGlaJhTy7Mui+y7c?= =?us-ascii?Q?axn2ygw9H/UmieIuhPv5dOqTSfxuBDGcxR6HGfaNj8lz67Kk1rAADKyPD5EM?= =?us-ascii?Q?kdEf/nnX2nijDI4Oqib+QOZAf4DTBZnic8tthyeNJpPYHgUbysSDdpTvBBUP?= =?us-ascii?Q?jHkp4fEsZLWfdnwVF7sxZyc6g6gG0AeW37CRxkVoTysAeBI8jguBo9In07lI?= =?us-ascii?Q?rREp+YK4Y37nE5D3H89g9RqLkseGpfswKAYHxUHM9vtlXwRZDRrM8T2c3zaP?= =?us-ascii?Q?T/5Q7ZL3t0aqHR54Boyb3qANgdYahMOetTFcAP84s99PPihmC2mHFjz+0h4u?= =?us-ascii?Q?boi6rVqk23h1am1oOOxR6YX/ZXJbkk9IhDPIuTy0+kgyOUavj3fMIdcuAK42?= =?us-ascii?Q?j3/lgwOuDPqcYCtzKf5ASluZ?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR11MB2854.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(1800799015)(366007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?R04ooDToND1V6FPYnNy/CGqEKkuVIkuMFeNIRWp4IRvA+yAxCFhVxkOelHO7?= =?us-ascii?Q?gEmIwwnhW1+RZR3+JuEIjlzLwJWrLyuUCcqwwx3nNlgrhrS5MBr6k7x3j7FV?= =?us-ascii?Q?dewnqaHJ31DlPa1FdRcjW7H4W7zuUqBYkBg4rBqohV9SnhYb42aPxtJw/3ow?= =?us-ascii?Q?M7Vb8UijI5eqyOnwWYWCVI5BnUwgXRdGWU9/wpKQV5ZXbtSDmYxS1DC2Uo1g?= =?us-ascii?Q?FNpKwkERV7r5iqRHssfZMPz4ks6Qqz1fCdGdZ439YSFsMbYE6mbm/cvjjg28?= =?us-ascii?Q?O7c1TREEo/OqEhwbqa0bn+GqbbseElD4aBjkxB21GLsb8MfMtvGvc9bfScO3?= =?us-ascii?Q?0zttRBhKyCElWYIG6C61/iEA4RtDVM7drUzrVPdloCnUs5i3XfRw+D20ml6P?= =?us-ascii?Q?CmWqndMdKXCqvnfFpcnHPCX/VFrV3+WqvAG2HPhZA974DalXUzYA8vEzj97u?= =?us-ascii?Q?rgLv5MuQVgTLPXjNHqfQz0rgIk+7DFfiJ6oawd5nsNMqom5oU/01XhDLmPpl?= =?us-ascii?Q?xQUVuopyxlEk6Vtlsp6mID144BkEc2CEzwWSAEP5ZJbRz5NTlD8C4qOow7dT?= =?us-ascii?Q?WiK6vSuJHKmjIRZTybLixGe10N9mIwqMeKB2XkcW2Wu6H4aulIxCoaA3MMKt?= =?us-ascii?Q?u1/7SXak45Urcz5BjDqL8+NgEXhN56WGPTuIT/jOO0TVk/mY3yel1Z0gxQfK?= =?us-ascii?Q?4cJoQCTvk+o4sm1aMR9AlIVOs0817mQbIBYAKlbeRZ7SLpIUTmSN6aOfFw2x?= =?us-ascii?Q?I1EzYiCvsNPdW5DuzQyPGrNCsRS07aFMczGn4yPff415Z8MA3UGACU7cb8zV?= =?us-ascii?Q?m5m3FRABc8YjITRmT+3vQPBJgZ+4FDNTiGCA9j7eDaHGBEfHsyU2KJngj1LN?= =?us-ascii?Q?YO2y66hxwgQLbfY56ltUZ2yTxJUnh18aRnwoe15PwyaHoucg6xGvPDyVX8aa?= =?us-ascii?Q?7qVDy0P2u0SWIhR0ntUXiSeT/1rE8vfXvGSkeoToZpU7vU0LLPGimmFH/J5x?= =?us-ascii?Q?1ctyySTuT0aBrRjBnbZEUAPoQZR/juSAV1zJB5veB7UGZ54FUG+V2jblU7C2?= =?us-ascii?Q?3SVp1eYTkkYKpMizBW6xGKyj9dkW5r6Gip/Z9XKOZ8SOR6Es0rh9U7ls7VQf?= =?us-ascii?Q?SJGuq6cp9J3feueEP6voLSUw1htR/fYBbYGmnB4XrhFbNgbK4drNUnzmmidi?= =?us-ascii?Q?yuCgmeNFUfxQIXUxuFKGCyTqpfno5tTZlerJdx1g6X5cXp7a0kYhrN6GQ2KR?= =?us-ascii?Q?PaWjvLsYFJCqzGpnTUD/bcdCCLHrJW0LZemOFV4O1jnNqtvMCjnwYekYBaMx?= =?us-ascii?Q?vsqesqzYMx5iH73g2hB/4jgMG+5dPSsDrnLiuqfC4L4Vryay0YxCe6zS6zA8?= =?us-ascii?Q?P9addKHXzHWB0Q493Xypc6nDUa8oPntCn12T8yYdzlLqDmHAN6w/bjymIpo5?= =?us-ascii?Q?f88dlGFu0dZg+j1pr1KkjqLjol2OwM87Gx6SfyCYauJ4TKHvVZgilbNUOueQ?= =?us-ascii?Q?NmY6FTQL3RtN4zvh5cyu9wyLa/AljhrFTQR4T7zZGemGmI3LYA/5xv612BSr?= =?us-ascii?Q?6wmnEOI1k2AcvKLF75/L2+NG4lDHUPCIvigtjoro?= X-MS-Exchange-CrossTenant-Network-Message-Id: 1220ea58-a426-4a09-a6c6-08dc863f9611 X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB2854.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2024 15:44:44.1014 (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: V9iqH66Fhivt0FLAdZLgZrl2LwyOk5a1BbgMDG4pene3sF9pACpyS2TzqRDfWs4rFguIYVMBS3uUHgYhagEh8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR11MB8404 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" On Tue, Jun 04, 2024 at 06:25:42PM +0300, Jani Nikula wrote: > Avoid the implicit dev_priv local variable use, and pass dev_priv > explicitly to the ICL_PIPESTATUS register macro. Reviewed-by: Rodrigo Vivi > > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 9 ++++++--- > drivers/gpu/drm/i915/i915_reg.h | 2 +- > 2 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c > index 401726f466c0..e5e4ca7cc499 100644 > --- a/drivers/gpu/drm/i915/display/intel_fifo_underrun.c > +++ b/drivers/gpu/drm/i915/display/intel_fifo_underrun.c > @@ -209,7 +209,8 @@ static void bdw_set_fifo_underrun_reporting(struct drm_device *dev, > > if (enable) { > if (DISPLAY_VER(dev_priv) >= 11) > - intel_de_write(dev_priv, ICL_PIPESTATUS(pipe), > + intel_de_write(dev_priv, > + ICL_PIPESTATUS(dev_priv, pipe), > icl_pipe_status_underrun_mask(dev_priv)); > > bdw_enable_pipe_irq(dev_priv, pipe, mask); > @@ -418,9 +419,11 @@ void intel_cpu_fifo_underrun_irq_handler(struct drm_i915_private *dev_priv, > * the underrun was caused by the downstream port. > */ > if (DISPLAY_VER(dev_priv) >= 11) { > - underruns = intel_de_read(dev_priv, ICL_PIPESTATUS(pipe)) & > + underruns = intel_de_read(dev_priv, > + ICL_PIPESTATUS(dev_priv, pipe)) & > icl_pipe_status_underrun_mask(dev_priv); > - intel_de_write(dev_priv, ICL_PIPESTATUS(pipe), underruns); > + intel_de_write(dev_priv, ICL_PIPESTATUS(dev_priv, pipe), > + underruns); > } > > if (intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, false)) { > diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h > index 1b2c0d650bff..cbe109973f57 100644 > --- a/drivers/gpu/drm/i915/i915_reg.h > +++ b/drivers/gpu/drm/i915/i915_reg.h > @@ -1927,7 +1927,7 @@ > #define PIPE_MISC2(pipe) _MMIO_PIPE(pipe, _PIPE_MISC2_A, _PIPE_MISC2_B) > > #define _ICL_PIPE_A_STATUS 0x70058 > -#define ICL_PIPESTATUS(pipe) _MMIO_PIPE2(dev_priv, pipe, _ICL_PIPE_A_STATUS) > +#define ICL_PIPESTATUS(dev_priv, pipe) _MMIO_PIPE2(dev_priv, pipe, _ICL_PIPE_A_STATUS) > #define PIPE_STATUS_UNDERRUN REG_BIT(31) > #define PIPE_STATUS_SOFT_UNDERRUN_XELPD REG_BIT(28) > #define PIPE_STATUS_HARD_UNDERRUN_XELPD REG_BIT(27) > -- > 2.39.2 >