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 5D938C02196 for ; Tue, 4 Feb 2025 23:06:16 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1984510E70C; Tue, 4 Feb 2025 23:06:16 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="GGuEa35r"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0EBAD10E709; Tue, 4 Feb 2025 23:06:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1738710374; x=1770246374; h=date:from:to:cc:subject:message-id:references: in-reply-to:mime-version; bh=3J2ySH+GOf4vr6N2/0W8nuUrKzKNl2cvSkKtumzhtyI=; b=GGuEa35rph8NRsRL/J5X1t6ryv7w2pZCKglZxRSCaZDnCC0U8CPwsIca CrC4/mrIRYLNGivn0rK11Awmu6ahdlNAPbF538u/Gg++TczjAaQd8UhBs lr6tHRMpxh0IZjIupSiKSELD0zRYixj8+oUC2niRX0/10GBErnM4flAYv 5kVRkykpstQ3fLbiZGWFHIesThjCINaIVwooaIuD3maA6lB6U/NhAp0Hk FR3Z/ulxyrWLvCcFuODJT0gj53jhbtUzl4ohQ+VjP7X4xHBjOHQybihnW C4FebWbmugeeZ5XgSLS0I4fm1eLHCONy/5SAdf39LYVv3AgwyOWMFWS0e w==; X-CSE-ConnectionGUID: /WNxe9AQQbK/GL33wCPomw== X-CSE-MsgGUID: mW/umXB9QaCRZ0FKXwlgsA== X-IronPort-AV: E=McAfee;i="6700,10204,11336"; a="38468672" X-IronPort-AV: E=Sophos;i="6.13,259,1732608000"; d="scan'208";a="38468672" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2025 15:06:13 -0800 X-CSE-ConnectionGUID: FoJqYD1wSa6jVDMqO0RUNA== X-CSE-MsgGUID: G/ARNBGeQwOr3Hm797v8Kw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="115916541" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orviesa005.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 04 Feb 2025 15:06:13 -0800 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) 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; Tue, 4 Feb 2025 15:06:12 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) 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 via Frontend Transport; Tue, 4 Feb 2025 15:06:12 -0800 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.173) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.44; Tue, 4 Feb 2025 15:06:12 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZIXjAH5/MJuFRZ0NN4v5SelccP4MnjMGQxHXjpwz6PZWwLy8sQAiOyeDL8cHjvVj+sbY4fdIvD6cQLNlGGYSSCuAXoO7w//9j/UgCmzXjMWyuHZkUAjKoMGBJAa6F7nYad6Zy0PzAKfi9LtTIoLASDLkYoPyGZIpzfgdpwzceGlgi7Qq/whMwW1Cmo1DmoXuQqCPzP1UuUN+PxiykFlBAwQiW1g/7UuAmSaYHxBrUksXpGVMltTHaXqh893TnkKDmoL8X6dVJ1uCEnf0UHQy7hOHAHRc4vRU/nsABiw7BgVQoOjxROTiszQb7pgaUt3CD2LGwJTXkuFgR6BiuSBLbQ== 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=Icf3VlmGE0n+JXapSwH2HdVzqnD5tjuz5f/CK8YBDoo=; b=pUh4f24Cs3LLLJh0qmzOrdaWMg+rot2OkqFo5lxjlvrMQ0xKlAH/z78phtabnrOPh9dBJPpc8CBCYPoO/8KjWNwuKLz+FzloC0CpppcoF83BGcVEqB52CuRlxiZ3lksrWuSIjGOsXo7Y0aWMbIRaCaogRqL0Vjd0OZiuWsVPobt+y1FwroUOECK2Z4pRng62ggxwUn1cjEUiB8OEO5lGwBNXlMVpL4O6Mulie+wk1syQzMj1cPEK5YMi3BFA1X29wQA+/0/zLbXdcX+vPL3jac9Lk2P+6OkFS2Rh1l6E0bfwLAOveYKGA/atO3aFfOYAZIOOynp5h9CStCHiwM7iDg== 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 PH7SPRMB0046.namprd11.prod.outlook.com (2603:10b6:510:1f6::20) by CY5PR11MB6187.namprd11.prod.outlook.com (2603:10b6:930:25::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8398.25; Tue, 4 Feb 2025 23:06:09 +0000 Received: from PH7SPRMB0046.namprd11.prod.outlook.com ([fe80::5088:3f5b:9a15:61dc]) by PH7SPRMB0046.namprd11.prod.outlook.com ([fe80::5088:3f5b:9a15:61dc%4]) with mapi id 15.20.8398.025; Tue, 4 Feb 2025 23:06:09 +0000 Date: Tue, 4 Feb 2025 18:06:05 -0500 From: Rodrigo Vivi To: Jani Nikula CC: , Subject: Re: [PATCH 2/3] drm/i915/cdclk: switch to new platform checks Message-ID: References: <20250204134228.2934744-1-jani.nikula@intel.com> <20250204134228.2934744-2-jani.nikula@intel.com> Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20250204134228.2934744-2-jani.nikula@intel.com> X-ClientProxiedBy: MW4PR03CA0198.namprd03.prod.outlook.com (2603:10b6:303:b8::23) To PH7SPRMB0046.namprd11.prod.outlook.com (2603:10b6:510:1f6::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7SPRMB0046:EE_|CY5PR11MB6187:EE_ X-MS-Office365-Filtering-Correlation-Id: a3260bc2-43dc-4d4f-2792-08dd457082c8 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:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?E4+aczSOMN4pERXc4RGBBB6t0V7cuX1EnWi3A7QWLH7I5ajhsW1zb++Uim7P?= =?us-ascii?Q?3oF6M/vZJ7j+DcJ/tFbmx0j7yVsCABkw6IivCQWKWe3S4ytAXYFCgL7jJREK?= =?us-ascii?Q?TeJE6rJbmESSSZsP1ybkM8RllnubFqmoIwgV2xE2iWpiKZP37e+oEbJ3rcJ1?= =?us-ascii?Q?Pq41PrIpM99XfqPCQhjZl8BF/uEHOxCnZeACsaeHO1szq8ddVGYyFj/8A4Fs?= =?us-ascii?Q?MVPsI1XyuxwhgBOL3MVy3eMS45PhrXVPGW/4W2+yH+lMiKgCS+F1XnF3KRtd?= =?us-ascii?Q?rnvZWWaspFaUyzAQpEThfx3Zu0Ia60f1Ga1WYdt0Q2oVq5AYUXhlmvHM8zKw?= =?us-ascii?Q?SGwxy0gwhdOhZCgDNGr4uh5jqmjbCdgtBGAcGOErTtA6bund3N7QAWEsWU/l?= =?us-ascii?Q?8mX/Uugaf72iNDVu3dl6C5yncR6uo25n38z4np2ETOneBeHIacAypVjfpC7b?= =?us-ascii?Q?RHqCvxiJz2edkEH96jnuGY8TRCMEMeq+7QmmVL8SITJc8vdUfYJsjAW5DueO?= =?us-ascii?Q?slPTZeZ/ParkYPnWmd2ScySP4h/dx8QZBQ0lwgfrO3irNLiTUwqeleSJsXcy?= =?us-ascii?Q?oMihKxJT1j518JOd8Uhv/1x10Emu++tF8upBgtRpVp3yWrcNn8NXav/WkiJ3?= =?us-ascii?Q?WoUjijBuo00emos/tdIvV7qvcytglZHy6avgeXrgxXePWoUTW87Kq6pKasd7?= =?us-ascii?Q?QGGJbtju67Aer9eTB++dc7OFBn3FnIU6JeOh59wyIZJRHSV0mUyHb8bw0W6x?= =?us-ascii?Q?Zj75h8W5oEgJkxsQ+TviP3TToKD2RaB0PhjFJA/eyWCPz2GRjlyhDjPUljc9?= =?us-ascii?Q?gNWdAiHBil1Yiet/NTjbX+zSHo2xCfnl0/sokwFx2H32DjTXfDUBNFSbDX/b?= =?us-ascii?Q?N5JaVhNdAJ4n0MZdwb/GHOMxLOC448i7Z9ZTKkewpo8m7F0gZD3Wika7tGyv?= =?us-ascii?Q?uUHufyKN0egL9K7vKz2YOTSReshmdjGLpjECAKd2T2lu+qfVp5UdVBARjNr4?= =?us-ascii?Q?KBP6BJHJeqlKbQkOwuqvDiyzXR1G3h1W0VntDgy90TrpaX7j+y17z6hkJqTb?= =?us-ascii?Q?cM15bzJ/e7nXcErXCbZtF6LuPSsitlcIDN0oeTftIOTbfLAGigshl2tmFP2C?= =?us-ascii?Q?s81bdCT7zJwEQdf9/JFyEyXrKwiaaT3jQRq1AAwg3q6aJMBBe4DT3lDTOIB5?= =?us-ascii?Q?5Enk9ISB6zN+o9xD8AdGNfmSxxNwuArsiPuiNzzNZbVaO1sW5/DcVrjPbK3x?= =?us-ascii?Q?e3iWtoBAN8EwJVJZwCipCn6CnJSHLWSJQ9VI5Y5w8bquf1f2DIFI9Ktgi/AD?= =?us-ascii?Q?sEsRrmHGNrw8CuvRtHF6EiqfbJW+NtJ43RJaPlBw1tKalea4Zc8MJ0k2LWkM?= =?us-ascii?Q?4rI0iK7vQjkb3XGrYSHjTEDNOWB+?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PH7SPRMB0046.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: =?us-ascii?Q?JBfQpygoDxhH12pyUn2ql3kr4yQeusuYJHFDH5GY6vFabXpHj1+KyMsmBSpI?= =?us-ascii?Q?IDe1uMdu9OeNHIuJfUH3kQotIcfJOW6gpLmJ1jeQqXzMXbCogKauWQ1g2sLP?= =?us-ascii?Q?QUW59SlhZ/nP2J1d2BXno8o27cK+5sT4YGLzM25tQTAmZQw6WaS259xrgcqz?= =?us-ascii?Q?hGpibdOThRGeG8dRA28OvhCGRevrjjXNPCQyiuuiGjrtdRbiIrsOhlkMlsS0?= =?us-ascii?Q?wId4xXLPfTTkbBdKD1slsnu0G+SDwmfnrXeMsE3C8db2jksmKMmmVSQ97nfI?= =?us-ascii?Q?fUp6JBJG/beLHUTLSeKduBv7TKQOTYhgt+dVB/XVFAjO9RCYuo2VyV0m/sz6?= =?us-ascii?Q?KF+KuSKqR7CSESHwNTm2p0amUaa9bJETkKBIvpWYZQzMh8btx0fdMcFlpblL?= =?us-ascii?Q?nFI5Wga7dSs2vpHgfHY82RORXyOX75Q6MA6xPXPIjrMYQkeAi9B7TcyxuY5w?= =?us-ascii?Q?/q2+FDGUQCajuiR5/rF4Zq58hB1d1/gL4/LTgWB+nnRvcSzvPVoDSetkVQ3u?= =?us-ascii?Q?cZorE64C8kAqEWWgpD1sljKRfEK1dCCMXDB8vpMMtpLat/4lP7mLlhcrpm59?= =?us-ascii?Q?4E62S7Z2KS0NKT09AqQGoCdAUUqEkpN3DPcwWn6eJ3kHZFNGY8a0or6qmM0U?= =?us-ascii?Q?2vymjbQ4VlvUAX9RHNMcAQDyhidh6LzH5I7viqMdtNO31g8Ptbp48JW7SEsQ?= =?us-ascii?Q?Hh5nXRGlRJVp+F55Ad2hU2x6gTRfHqP+3HflNVjK0yjMYeR90KZNqPBq0MEw?= =?us-ascii?Q?+ai2o62F6fUfIPN654QZ4QeGPKv8AIL+TcJ4UXU0lWyGcefsbY6nLqU0Ab24?= =?us-ascii?Q?ASWjCZ22Ijln2xAeTEb6/a4P8ebP+pjswDBN37EjTCM+mzx8HtnFZNvtoago?= =?us-ascii?Q?T/bBwCDH0ztOPK3WsRN1hogko6P3m8FQEKHQTRmYaD+MCKe2QCR2gsxAZiKf?= =?us-ascii?Q?lzeCjpRdo1ZH+FnknSTZSRB7NOiGm9qfE6BfLxTAfUmvrzKk+sUU22eti5N9?= =?us-ascii?Q?rS3wD0oiqfVOfXWst+/Jbm6ioV09/XZGvd3VUHaokvJSWUfzxLqsuPc+bNLD?= =?us-ascii?Q?Ib58rfuh2Al7uRS+l+yS1qHK0Ww9dg2PNOXMWAC8Wxqx22UKIQYo/KlpiemU?= =?us-ascii?Q?xz03YE9Go44ZU+whAp2/g/bMvAGbgND1FmMfHe5gCYltNd0BdjuEvhKgJyrR?= =?us-ascii?Q?gCQc13RRGIHT5JYY2Zz/4MjlPVTZUPNmL6ZNl6opzFgjpPMbUHNKXh0sYwoZ?= =?us-ascii?Q?sSfoISpcNpbHPnw8cHDjVZle6KbktG6d+ZgjdC62f+Tve1aycLZg/HWN3sc9?= =?us-ascii?Q?tWGQkB9K0lLgNephLr+dXS3opo7HORFVqgZ8FOp70y0/EbcPYtYf26vMSoDX?= =?us-ascii?Q?YFrdEc368jO//kIkuvgImpARr+R6PRI2iNGbLTTSShB0ONPuBI4rpAYXdCPT?= =?us-ascii?Q?lnb6vPn+af5x8lbN3tBJrPPJOP/mngWw9XeRdOYnuu6TMp7H+RzMAKyPNAyz?= =?us-ascii?Q?1MJQ2kTp/IJWldUsBNF7mAlOoCIPNHLaa0twEuCoxE1WXbigU92l1kx3g6Ss?= =?us-ascii?Q?5srwceyZDmQCOKavJUHeq1tzcWx6DfEl4Z4MDHmZpzbeaP1zHfwmtsDBl3WE?= =?us-ascii?Q?lQ=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: a3260bc2-43dc-4d4f-2792-08dd457082c8 X-MS-Exchange-CrossTenant-AuthSource: PH7SPRMB0046.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Feb 2025 23:06:09.1366 (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: /TjxMAW2lYhZs0sm9K0Jp2IQkdy4eeHcagwXpLDEbcl8JrTrkwZ8RVEr3QEeZJTSzjshlhfgJXYxZi3UqYgUlQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6187 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 Tue, Feb 04, 2025 at 03:42:27PM +0200, Jani Nikula wrote: > Switch the IS_() checks to display->platform., and > drop a number of struct drm_i915_private pointers in the process. > > While at it, replace > > /* NOOP */; > > with > ; /* NOOP */ > > to avoid a checkpatch warning on misleading indentation. > > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/i915/display/intel_cdclk.c | 159 +++++++++------------ > 1 file changed, 68 insertions(+), 91 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c b/drivers/gpu/drm/i915/display/intel_cdclk.c > index b520231833b7..753ba3e3a0b7 100644 > --- a/drivers/gpu/drm/i915/display/intel_cdclk.c > +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c > @@ -314,27 +314,26 @@ static unsigned int intel_hpll_vco(struct intel_display *display) > [4] = 2666667, > [5] = 4266667, > }; > - struct drm_i915_private *dev_priv = to_i915(display->drm); > const unsigned int *vco_table; > unsigned int vco; > u8 tmp = 0; > > /* FIXME other chipsets? */ > - if (IS_GM45(dev_priv)) > + if (display->platform.gm45) > vco_table = ctg_vco; > - else if (IS_G45(dev_priv)) > + else if (display->platform.g45) > vco_table = elk_vco; > - else if (IS_I965GM(dev_priv)) > + else if (display->platform.i965gm) > vco_table = cl_vco; > - else if (IS_PINEVIEW(dev_priv)) > + else if (display->platform.pineview) > vco_table = pnv_vco; > - else if (IS_G33(dev_priv)) > + else if (display->platform.g33) > vco_table = blb_vco; > else > return 0; > > - tmp = intel_de_read(display, > - IS_PINEVIEW(dev_priv) || IS_MOBILE(dev_priv) ? HPLLVCO_MOBILE : HPLLVCO); > + tmp = intel_de_read(display, display->platform.pineview || > + display->platform.mobile ? HPLLVCO_MOBILE : HPLLVCO); > > vco = vco_table[tmp & 0x7]; > if (vco == 0) > @@ -508,7 +507,6 @@ static void gm45_get_cdclk(struct intel_display *display, > static void hsw_get_cdclk(struct intel_display *display, > struct intel_cdclk_config *cdclk_config) > { > - struct drm_i915_private *dev_priv = to_i915(display->drm); > u32 lcpll = intel_de_read(display, LCPLL_CTL); > u32 freq = lcpll & LCPLL_CLK_FREQ_MASK; > > @@ -518,7 +516,7 @@ static void hsw_get_cdclk(struct intel_display *display, > cdclk_config->cdclk = 450000; > else if (freq == LCPLL_CLK_FREQ_450) > cdclk_config->cdclk = 450000; > - else if (IS_HASWELL_ULT(dev_priv)) > + else if (display->platform.haswell_ult) > cdclk_config->cdclk = 337500; > else > cdclk_config->cdclk = 540000; > @@ -535,7 +533,7 @@ static int vlv_calc_cdclk(struct intel_display *display, int min_cdclk) > * Not sure what's wrong. For now use 200MHz only when all pipes > * are off. > */ > - if (IS_VALLEYVIEW(dev_priv) && min_cdclk > freq_320) > + if (display->platform.valleyview && min_cdclk > freq_320) > return 400000; > else if (min_cdclk > 266667) > return freq_320; > @@ -549,7 +547,7 @@ static u8 vlv_calc_voltage_level(struct intel_display *display, int cdclk) > { > struct drm_i915_private *dev_priv = to_i915(display->drm); > > - if (IS_VALLEYVIEW(dev_priv)) { > + if (display->platform.valleyview) { > if (cdclk >= 320000) /* jump to highest voltage for 400MHz too */ > return 2; > else if (cdclk >= 266667) > @@ -585,7 +583,7 @@ static void vlv_get_cdclk(struct intel_display *display, > vlv_iosf_sb_put(dev_priv, > BIT(VLV_IOSF_SB_CCK) | BIT(VLV_IOSF_SB_PUNIT)); > > - if (IS_VALLEYVIEW(dev_priv)) > + if (display->platform.valleyview) > cdclk_config->voltage_level = (val & DSPFREQGUAR_MASK) >> > DSPFREQGUAR_SHIFT; > else > @@ -598,14 +596,14 @@ static void vlv_program_pfi_credits(struct intel_display *display) > struct drm_i915_private *dev_priv = to_i915(display->drm); > unsigned int credits, default_credits; > > - if (IS_CHERRYVIEW(dev_priv)) > + if (display->platform.cherryview) > default_credits = PFI_CREDIT(12); > else > default_credits = PFI_CREDIT(8); > > if (display->cdclk.hw.cdclk >= dev_priv->czclk_freq) { > /* CHV suggested value is 31 or 63 */ > - if (IS_CHERRYVIEW(dev_priv)) > + if (display->platform.cherryview) > credits = PFI_CREDIT_63; > else > credits = PFI_CREDIT(15); > @@ -1142,7 +1140,7 @@ static void skl_set_cdclk(struct intel_display *display, > * minimum 308MHz CDCLK. > */ > drm_WARN_ON_ONCE(display->drm, > - IS_SKYLAKE(dev_priv) && vco == 8640000); > + display->platform.skylake && vco == 8640000); > > ret = skl_pcode_request(&dev_priv->uncore, SKL_PCODE_CDCLK_CONTROL, > SKL_CDCLK_PREPARE_FOR_CHANGE, > @@ -1662,10 +1660,9 @@ static void icl_readout_refclk(struct intel_display *display, > static void bxt_de_pll_readout(struct intel_display *display, > struct intel_cdclk_config *cdclk_config) > { > - struct drm_i915_private *dev_priv = to_i915(display->drm); > u32 val, ratio; > > - if (IS_DG2(dev_priv)) > + if (display->platform.dg2) > cdclk_config->ref = 38400; > else if (DISPLAY_VER(display) >= 11) > icl_readout_refclk(display, cdclk_config); > @@ -2057,11 +2054,9 @@ static bool cdclk_compute_crawl_and_squash_midpoint(struct intel_display *displa > > static bool pll_enable_wa_needed(struct intel_display *display) > { > - struct drm_i915_private *dev_priv = to_i915(display->drm); > - > return (DISPLAY_VERx100(display) == 2000 || > DISPLAY_VERx100(display) == 1400 || > - IS_DG2(dev_priv)) && > + display->platform.dg2) && > display->cdclk.hw.vco > 0; > } > > @@ -2069,7 +2064,6 @@ static u32 bxt_cdclk_ctl(struct intel_display *display, > const struct intel_cdclk_config *cdclk_config, > enum pipe pipe) > { > - struct drm_i915_private *i915 = to_i915(display->drm); > int cdclk = cdclk_config->cdclk; > int vco = cdclk_config->vco; > u16 waveform; > @@ -2084,7 +2078,7 @@ static u32 bxt_cdclk_ctl(struct intel_display *display, > * Disable SSA Precharge when CD clock frequency < 500 MHz, > * enable otherwise. > */ > - if ((IS_GEMINILAKE(i915) || IS_BROXTON(i915)) && > + if ((display->platform.geminilake || display->platform.broxton) && > cdclk >= 500000) > val |= BXT_CDCLK_SSA_PRECHARGE_ENABLE; > > @@ -2144,8 +2138,8 @@ static void bxt_set_cdclk(struct intel_display *display, > * mailbox communication, skip > * this step. > */ > - if (DISPLAY_VER(display) >= 14 || IS_DG2(dev_priv)) > - /* NOOP */; > + if (DISPLAY_VER(display) >= 14 || display->platform.dg2) > + ; /* NOOP */ I wonder if it wouldn't be better to use parenthesis instead of this, but anyway Reviewed-by: Rodrigo Vivi > else if (DISPLAY_VER(display) >= 11) > ret = skl_pcode_request(&dev_priv->uncore, SKL_PCODE_CDCLK_CONTROL, > SKL_CDCLK_PREPARE_FOR_CHANGE, > @@ -2186,7 +2180,7 @@ static void bxt_set_cdclk(struct intel_display *display, > * NOOP - No Pcode communication needed for > * Display versions 14 and beyond > */; > - else if (DISPLAY_VER(display) >= 11 && !IS_DG2(dev_priv)) > + else if (DISPLAY_VER(display) >= 11 && !display->platform.dg2) > ret = snb_pcode_write(&dev_priv->uncore, SKL_PCODE_CDCLK_CONTROL, > cdclk_config->voltage_level); > if (DISPLAY_VER(display) < 11) { > @@ -2318,9 +2312,7 @@ static void bxt_cdclk_uninit_hw(struct intel_display *display) > */ > void intel_cdclk_init_hw(struct intel_display *display) > { > - struct drm_i915_private *i915 = to_i915(display->drm); > - > - if (DISPLAY_VER(display) >= 10 || IS_BROXTON(i915)) > + if (DISPLAY_VER(display) >= 10 || display->platform.broxton) > bxt_cdclk_init_hw(display); > else if (DISPLAY_VER(display) == 9) > skl_cdclk_init_hw(display); > @@ -2335,9 +2327,7 @@ void intel_cdclk_init_hw(struct intel_display *display) > */ > void intel_cdclk_uninit_hw(struct intel_display *display) > { > - struct drm_i915_private *i915 = to_i915(display->drm); > - > - if (DISPLAY_VER(display) >= 10 || IS_BROXTON(i915)) > + if (DISPLAY_VER(display) >= 10 || display->platform.broxton) > bxt_cdclk_uninit_hw(display); > else if (DISPLAY_VER(display) == 9) > skl_cdclk_uninit_hw(display); > @@ -2438,10 +2428,8 @@ static bool intel_cdclk_can_cd2x_update(struct intel_display *display, > const struct intel_cdclk_config *a, > const struct intel_cdclk_config *b) > { > - struct drm_i915_private *dev_priv = to_i915(display->drm); > - > /* Older hw doesn't have the capability */ > - if (DISPLAY_VER(display) < 10 && !IS_BROXTON(dev_priv)) > + if (DISPLAY_VER(display) < 10 && !display->platform.broxton) > return false; > > /* > @@ -2495,7 +2483,7 @@ static void intel_pcode_notify(struct intel_display *display, > int ret; > u32 update_mask = 0; > > - if (!IS_DG2(i915)) > + if (!display->platform.dg2) > return; > > update_mask = DISPLAY_TO_PCODE_UPDATE_MASK(cdclk, active_pipe_count, voltage_level); > @@ -2681,7 +2669,6 @@ void > intel_set_cdclk_pre_plane_update(struct intel_atomic_state *state) > { > struct intel_display *display = to_intel_display(state); > - struct drm_i915_private *i915 = to_i915(display->drm); > const struct intel_cdclk_state *old_cdclk_state = > intel_atomic_get_old_cdclk_state(state); > const struct intel_cdclk_state *new_cdclk_state = > @@ -2693,7 +2680,7 @@ intel_set_cdclk_pre_plane_update(struct intel_atomic_state *state) > &new_cdclk_state->actual)) > return; > > - if (IS_DG2(i915)) > + if (display->platform.dg2) > intel_cdclk_pcode_pre_notify(state); > > if (new_cdclk_state->disable_pipes) { > @@ -2735,7 +2722,6 @@ void > intel_set_cdclk_post_plane_update(struct intel_atomic_state *state) > { > struct intel_display *display = to_intel_display(state); > - struct drm_i915_private *i915 = to_i915(display->drm); > const struct intel_cdclk_state *old_cdclk_state = > intel_atomic_get_old_cdclk_state(state); > const struct intel_cdclk_state *new_cdclk_state = > @@ -2746,7 +2732,7 @@ intel_set_cdclk_post_plane_update(struct intel_atomic_state *state) > &new_cdclk_state->actual)) > return; > > - if (IS_DG2(i915)) > + if (display->platform.dg2) > intel_cdclk_pcode_post_notify(state); > > if (!new_cdclk_state->disable_pipes && > @@ -2770,12 +2756,10 @@ static int intel_cdclk_ppc(struct intel_display *display, bool double_wide) > /* max pixel rate as % of CDCLK (not accounting for PPC) */ > static int intel_cdclk_guardband(struct intel_display *display) > { > - struct drm_i915_private *dev_priv = to_i915(display->drm); > - > if (DISPLAY_VER(display) >= 9 || > - IS_BROADWELL(dev_priv) || IS_HASWELL(dev_priv)) > + display->platform.broadwell || display->platform.haswell) > return 100; > - else if (IS_CHERRYVIEW(dev_priv)) > + else if (display->platform.cherryview) > return 95; > else > return 90; > @@ -2878,7 +2862,7 @@ static int intel_compute_min_cdclk(struct intel_atomic_state *state) > * by changing the cd2x divider (see glk_cdclk_table[]) and > * thus a full modeset won't be needed then. > */ > - if (IS_GEMINILAKE(dev_priv) && cdclk_state->active_pipes && > + if (display->platform.geminilake && cdclk_state->active_pipes && > !is_power_of_2(cdclk_state->active_pipes)) > min_cdclk = max(min_cdclk, 2 * 96000); > > @@ -3232,7 +3216,6 @@ static bool intel_cdclk_need_serialize(struct intel_display *display, > const struct intel_cdclk_state *old_cdclk_state, > const struct intel_cdclk_state *new_cdclk_state) > { > - struct drm_i915_private *i915 = to_i915(display->drm); > bool power_well_cnt_changed = hweight8(old_cdclk_state->active_pipes) != > hweight8(new_cdclk_state->active_pipes); > bool cdclk_changed = intel_cdclk_changed(&old_cdclk_state->actual, > @@ -3241,7 +3224,7 @@ static bool intel_cdclk_need_serialize(struct intel_display *display, > * We need to poke hw for gen >= 12, because we notify PCode if > * pipe power well count changes. > */ > - return cdclk_changed || (IS_DG2(i915) && power_well_cnt_changed); > + return cdclk_changed || (display->platform.dg2 && power_well_cnt_changed); > } > > int intel_modeset_calc_cdclk(struct intel_atomic_state *state) > @@ -3376,11 +3359,9 @@ static int intel_compute_max_dotclk(struct intel_display *display) > */ > void intel_update_max_cdclk(struct intel_display *display) > { > - struct drm_i915_private *dev_priv = to_i915(display->drm); > - > if (DISPLAY_VER(display) >= 30) { > display->cdclk.max_cdclk_freq = 691200; > - } else if (IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) { > + } else if (display->platform.jasperlake || display->platform.elkhartlake) { > if (display->cdclk.hw.ref == 24000) > display->cdclk.max_cdclk_freq = 552000; > else > @@ -3390,9 +3371,9 @@ void intel_update_max_cdclk(struct intel_display *display) > display->cdclk.max_cdclk_freq = 648000; > else > display->cdclk.max_cdclk_freq = 652800; > - } else if (IS_GEMINILAKE(dev_priv)) { > + } else if (display->platform.geminilake) { > display->cdclk.max_cdclk_freq = 316800; > - } else if (IS_BROXTON(dev_priv)) { > + } else if (display->platform.broxton) { > display->cdclk.max_cdclk_freq = 624000; > } else if (DISPLAY_VER(display) == 9) { > u32 limit = intel_de_read(display, SKL_DFSM) & SKL_DFSM_CDCLK_LIMIT_MASK; > @@ -3416,7 +3397,7 @@ void intel_update_max_cdclk(struct intel_display *display) > max_cdclk = 308571; > > display->cdclk.max_cdclk_freq = skl_calc_cdclk(max_cdclk, vco); > - } else if (IS_BROADWELL(dev_priv)) { > + } else if (display->platform.broadwell) { > /* > * FIXME with extra cooling we can allow > * 540 MHz for ULX and 675 Mhz for ULT. > @@ -3425,15 +3406,15 @@ void intel_update_max_cdclk(struct intel_display *display) > */ > if (intel_de_read(display, FUSE_STRAP) & HSW_CDCLK_LIMIT) > display->cdclk.max_cdclk_freq = 450000; > - else if (IS_BROADWELL_ULX(dev_priv)) > + else if (display->platform.broadwell_ulx) > display->cdclk.max_cdclk_freq = 450000; > - else if (IS_BROADWELL_ULT(dev_priv)) > + else if (display->platform.broadwell_ult) > display->cdclk.max_cdclk_freq = 540000; > else > display->cdclk.max_cdclk_freq = 675000; > - } else if (IS_CHERRYVIEW(dev_priv)) { > + } else if (display->platform.cherryview) { > display->cdclk.max_cdclk_freq = 320000; > - } else if (IS_VALLEYVIEW(dev_priv)) { > + } else if (display->platform.valleyview) { > display->cdclk.max_cdclk_freq = 400000; > } else { > /* otherwise assume cdclk is fixed */ > @@ -3457,8 +3438,6 @@ void intel_update_max_cdclk(struct intel_display *display) > */ > void intel_update_cdclk(struct intel_display *display) > { > - struct drm_i915_private *dev_priv = to_i915(display->drm); > - > intel_cdclk_get_cdclk(display, &display->cdclk.hw); > > /* > @@ -3467,7 +3446,7 @@ void intel_update_cdclk(struct intel_display *display) > * of cdclk that generates 4MHz reference clock freq which is used to > * generate GMBus clock. This will vary with the cdclk freq. > */ > - if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) > + if (display->platform.valleyview || display->platform.cherryview) > intel_de_write(display, GMBUSFREQ_VLV, > DIV_ROUND_UP(display->cdclk.hw.cdclk, 1000)); > } > @@ -3561,7 +3540,7 @@ u32 intel_read_rawclk(struct intel_display *display) > freq = cnp_rawclk(display); > else if (HAS_PCH_SPLIT(dev_priv)) > freq = pch_rawclk(display); > - else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) > + else if (display->platform.valleyview || display->platform.cherryview) > freq = vlv_hrawclk(display); > else if (DISPLAY_VER(display) >= 3) > freq = i9xx_hrawclk(display); > @@ -3742,8 +3721,6 @@ static const struct intel_cdclk_funcs i830_cdclk_funcs = { > */ > void intel_init_cdclk_hooks(struct intel_display *display) > { > - struct drm_i915_private *dev_priv = to_i915(display->drm); > - > if (DISPLAY_VER(display) >= 30) { > display->funcs.cdclk = &xe3lpd_cdclk_funcs; > display->cdclk.table = xe3lpd_cdclk_table; > @@ -3756,80 +3733,80 @@ void intel_init_cdclk_hooks(struct intel_display *display) > } else if (DISPLAY_VER(display) >= 14) { > display->funcs.cdclk = &rplu_cdclk_funcs; > display->cdclk.table = mtl_cdclk_table; > - } else if (IS_DG2(dev_priv)) { > + } else if (display->platform.dg2) { > display->funcs.cdclk = &tgl_cdclk_funcs; > display->cdclk.table = dg2_cdclk_table; > - } else if (IS_ALDERLAKE_P(dev_priv)) { > + } else if (display->platform.alderlake_p) { > /* Wa_22011320316:adl-p[a0] */ > - if (IS_ALDERLAKE_P(dev_priv) && IS_DISPLAY_STEP(dev_priv, STEP_A0, STEP_B0)) { > + if (display->platform.alderlake_p && IS_DISPLAY_STEP(display, STEP_A0, STEP_B0)) { > display->cdclk.table = adlp_a_step_cdclk_table; > display->funcs.cdclk = &tgl_cdclk_funcs; > - } else if (IS_RAPTORLAKE_U(dev_priv)) { > + } else if (display->platform.alderlake_p_raptorlake_u) { > display->cdclk.table = rplu_cdclk_table; > display->funcs.cdclk = &rplu_cdclk_funcs; > } else { > display->cdclk.table = adlp_cdclk_table; > display->funcs.cdclk = &tgl_cdclk_funcs; > } > - } else if (IS_ROCKETLAKE(dev_priv)) { > + } else if (display->platform.rocketlake) { > display->funcs.cdclk = &tgl_cdclk_funcs; > display->cdclk.table = rkl_cdclk_table; > } else if (DISPLAY_VER(display) >= 12) { > display->funcs.cdclk = &tgl_cdclk_funcs; > display->cdclk.table = icl_cdclk_table; > - } else if (IS_JASPERLAKE(dev_priv) || IS_ELKHARTLAKE(dev_priv)) { > + } else if (display->platform.jasperlake || display->platform.elkhartlake) { > display->funcs.cdclk = &ehl_cdclk_funcs; > display->cdclk.table = icl_cdclk_table; > } else if (DISPLAY_VER(display) >= 11) { > display->funcs.cdclk = &icl_cdclk_funcs; > display->cdclk.table = icl_cdclk_table; > - } else if (IS_GEMINILAKE(dev_priv) || IS_BROXTON(dev_priv)) { > + } else if (display->platform.geminilake || display->platform.broxton) { > display->funcs.cdclk = &bxt_cdclk_funcs; > - if (IS_GEMINILAKE(dev_priv)) > + if (display->platform.geminilake) > display->cdclk.table = glk_cdclk_table; > else > display->cdclk.table = bxt_cdclk_table; > } else if (DISPLAY_VER(display) == 9) { > display->funcs.cdclk = &skl_cdclk_funcs; > - } else if (IS_BROADWELL(dev_priv)) { > + } else if (display->platform.broadwell) { > display->funcs.cdclk = &bdw_cdclk_funcs; > - } else if (IS_HASWELL(dev_priv)) { > + } else if (display->platform.haswell) { > display->funcs.cdclk = &hsw_cdclk_funcs; > - } else if (IS_CHERRYVIEW(dev_priv)) { > + } else if (display->platform.cherryview) { > display->funcs.cdclk = &chv_cdclk_funcs; > - } else if (IS_VALLEYVIEW(dev_priv)) { > + } else if (display->platform.valleyview) { > display->funcs.cdclk = &vlv_cdclk_funcs; > - } else if (IS_SANDYBRIDGE(dev_priv) || IS_IVYBRIDGE(dev_priv)) { > + } else if (display->platform.sandybridge || display->platform.ivybridge) { > display->funcs.cdclk = &fixed_400mhz_cdclk_funcs; > - } else if (IS_IRONLAKE(dev_priv)) { > + } else if (display->platform.ironlake) { > display->funcs.cdclk = &ilk_cdclk_funcs; > - } else if (IS_GM45(dev_priv)) { > + } else if (display->platform.gm45) { > display->funcs.cdclk = &gm45_cdclk_funcs; > - } else if (IS_G45(dev_priv)) { > + } else if (display->platform.g45) { > display->funcs.cdclk = &g33_cdclk_funcs; > - } else if (IS_I965GM(dev_priv)) { > + } else if (display->platform.i965gm) { > display->funcs.cdclk = &i965gm_cdclk_funcs; > - } else if (IS_I965G(dev_priv)) { > + } else if (display->platform.i965g) { > display->funcs.cdclk = &fixed_400mhz_cdclk_funcs; > - } else if (IS_PINEVIEW(dev_priv)) { > + } else if (display->platform.pineview) { > display->funcs.cdclk = &pnv_cdclk_funcs; > - } else if (IS_G33(dev_priv)) { > + } else if (display->platform.g33) { > display->funcs.cdclk = &g33_cdclk_funcs; > - } else if (IS_I945GM(dev_priv)) { > + } else if (display->platform.i945gm) { > display->funcs.cdclk = &i945gm_cdclk_funcs; > - } else if (IS_I945G(dev_priv)) { > + } else if (display->platform.i945g) { > display->funcs.cdclk = &fixed_400mhz_cdclk_funcs; > - } else if (IS_I915GM(dev_priv)) { > + } else if (display->platform.i915gm) { > display->funcs.cdclk = &i915gm_cdclk_funcs; > - } else if (IS_I915G(dev_priv)) { > + } else if (display->platform.i915g) { > display->funcs.cdclk = &i915g_cdclk_funcs; > - } else if (IS_I865G(dev_priv)) { > + } else if (display->platform.i865g) { > display->funcs.cdclk = &i865g_cdclk_funcs; > - } else if (IS_I85X(dev_priv)) { > + } else if (display->platform.i85x) { > display->funcs.cdclk = &i85x_cdclk_funcs; > - } else if (IS_I845G(dev_priv)) { > + } else if (display->platform.i845g) { > display->funcs.cdclk = &i845g_cdclk_funcs; > - } else if (IS_I830(dev_priv)) { > + } else if (display->platform.i830) { > display->funcs.cdclk = &i830_cdclk_funcs; > } > > -- > 2.39.5 >