From patchwork Tue Feb 18 01:02:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 13978799 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 7F906C021AB for ; Tue, 18 Feb 2025 01:02:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C56C610E2DA; Tue, 18 Feb 2025 01:02:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="XBPVuMnZ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 327B410E2D1; Tue, 18 Feb 2025 01:02:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739840558; x=1771376558; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=JaZXgVczNGJVz20Q426pNB0eXZmtexFwT/aTFLNfTDs=; b=XBPVuMnZVgmwGCKbfHimqFFLqfx8eYhbKS0CZo2LxVUl6mAOWH1DBDh5 vevxVdKBE7Fel4yBOFFN/OpJPA9a1AePgCR9n9iWLQz9V0anKBMNjQt/t 2AzOJWHISTZvUtCj2hvhuO5Q1W1MG2G8puVrRiKAcrGA2LlS7YUl1GHVj ksDHbQYLEKJuS7OcSnBz/Yy/Z7eiUv6usTlXwgbaQ49w1LN+eNZrqNlyM 9gOYzbmF5TzAsRxG6icfhDL+phPSeQr6872decWq7Dj3TovrlbaKMaqEz Dv3d/EhffaTw7T6S+sH1w1HnUWoBrAYpvGR8ACsbcmdONQWxYnY4akoeR A==; X-CSE-ConnectionGUID: RKFnTy3nRn+ErCda3MULIw== X-CSE-MsgGUID: ofFPVbw5TweRzoMPlW+qSA== X-IronPort-AV: E=McAfee;i="6700,10204,11348"; a="40383671" X-IronPort-AV: E=Sophos;i="6.13,294,1732608000"; d="scan'208";a="40383671" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Feb 2025 17:02:36 -0800 X-CSE-ConnectionGUID: 7sDGFA9QTsaBhfhYyiu+rA== X-CSE-MsgGUID: bbkeoVZVQW+Mj47CIly0jQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,294,1732608000"; d="scan'208";a="114175308" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orviesa006.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 17 Feb 2025 17:02:35 -0800 Received: from ORSMSX901.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.44; Mon, 17 Feb 2025 17:02:35 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by ORSMSX901.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14 via Frontend Transport; Mon, 17 Feb 2025 17:02:35 -0800 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.49) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.44; Mon, 17 Feb 2025 17:02:33 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ew/wUYNGYoFW3ThN3UhZoZfHv8dOz+lUKJkea9Jx4HhoTgxOSJGBIg/AkOPn6vgfUW+zUP0jveXVYVlY59LYtpBc0tecIq1SlX4gLIQ6SmoMvx1lNXhyrIBPUWb9r+LvaKZi1fHltyfYMtNdj+XIbGswSPV+cn0dlyLY7LeL0wGDdZ/YC4fKkarqYORz9f74n+F7/iFhAI1+4ws/cLbKl8yBvF5INvD73RPUjqMeGYUOycnf6u/LxenHzAmseKc5GZ1klL64/1Y3LwmZmy5wSndfNz/VA72C3JGPQF9Fv+RYUXXD8tXlRWIUK3mkJYU5sYsYUcb87Wvj7MlLDW5URA== 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=deQJH/asjzscXIBo9gMtaO40YcEpBJKWwLBwNyUzQjw=; b=hFbWhhaaSlCo6xbAyGmV/mlAGO78oeLiBq2r+OBZO16pudNJGDxTjjANmvxuWFDTVnuBnqnHDyZTCpuqJ8QddYooCFXKLfyEvuHzownSTvqbcvvx9Ba5iiVdVW0Px6/oIlKYKHGUQli428LFyqSiku8hRFq/THjbNr/eQGMbp98hLtOv9g/pSISt+jQaJ4KV+L0uoMfEVfkH/KYHnEl9G5h027m9+1bg1g+2UwVAMjtDR5mo0OFfT/bWj0loTyq0asBIl65afjW3TmOSj6u9d6nol2Dec3Hz/6m0kuiOklU5AP/UlWM4CgzSi25/kiHI2WDR5VShgT9rSS3N1hhpYA== 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 IA1PR11MB6075.namprd11.prod.outlook.com (2603:10b6:208:3d5::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.17; Tue, 18 Feb 2025 01:02:31 +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.8422.015; Tue, 18 Feb 2025 01:02:30 +0000 From: Rodrigo Vivi To: , CC: Rodrigo Vivi Subject: [PATCH 1/2] drm/{i915,xe}: Move intel_pch under display Date: Mon, 17 Feb 2025 20:02:21 -0500 Message-ID: <20250218010224.761209-1-rodrigo.vivi@intel.com> X-Mailer: git-send-email 2.48.1 X-ClientProxiedBy: MW3PR05CA0027.namprd05.prod.outlook.com (2603:10b6:303:2b::32) To PH7SPRMB0046.namprd11.prod.outlook.com (2603:10b6:510:1f6::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH7SPRMB0046:EE_|IA1PR11MB6075:EE_ X-MS-Office365-Filtering-Correlation-Id: 512efeab-e054-4146-97a6-08dd4fb7eaa2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|366016|1800799024; X-Microsoft-Antispam-Message-Info: =?utf-8?q?tMI2zYEbu9IjCQvs8649rDG1G+zOIPq?= =?utf-8?q?itpp9oa4a9Y/vDAqyvXVzD5xxTFvAVlbhM3O5UzVXdRC7/iPd7ySv4dTha7E9faq2?= =?utf-8?q?Gj7z3Ml03uxKKIJc0cAjmZMw4aVs70RdrbZmIZKGu++0YNBPS3m+RlJdPXCk3XHeD?= =?utf-8?q?UTPEZuWHmvEzUIkhL+1MV2C+ElBCUcVzWtEQEvo0BLCH90DnPyHkaW8xLGvfnOesr?= =?utf-8?q?oCPBTzj59v8P6BRKGmNa7j3pTRa9dmjfbhfVYDV/CGEfSt2iCxPGKzmI6gFhaoGwH?= =?utf-8?q?xKwZZQGK5PmWNXyz/zhyXeIfK5InzxHu+8ktsF1Az1MUgUThsOMVyixZICaVzX2dq?= =?utf-8?q?x+KbbhTJilNjMA1bOmHUSzjZZR+oZg03TThMfJZhfDKbuL8JrRty7T8uIvE1VTjFi?= =?utf-8?q?n/bT52WSZfdtIFK333NiyPBCVqU2rm29Cnu/lL7g9i/inRbvokP5gFnRO1KfQnUwt?= =?utf-8?q?Ar5Bh+586fiIXbi1ZgCqbX2RkuRVDgUn6TS9YCToZ74mHWumjuPrxEIUcmp16P0Wg?= =?utf-8?q?dVwsowQeD7yZ/5A9BSVpntw3TYEY87LQVW2Mzu1cWzO004UeI7wXziCW29Ok+Pqoo?= =?utf-8?q?Z1yuopM08pFtXDRe1bnQt9wECBTLq8W/7/CrfoSpTPsYHnozsRJUci/7CKWS/YTQ8?= =?utf-8?q?aoug6YPfgU+hyrY1o/ZBX7LIR2RWRmlXrrC3W9QarzUwmiLeQP+gf2ZHtSKru3Ett?= =?utf-8?q?DMeuj1Xt5TJcbkGyigjX/zw2NeC6mfLgokJ+K8koRIVPoJCAFiNONtFpVn1ZbKzEz?= =?utf-8?q?yfFp5+e2ZFOxRHteyYPB4q5H8HRZEi7DGSe2jFjazf4FsJ0MwT2h4VB8UnqhopGAs?= =?utf-8?q?5yG814d3P0tJhYYZNWTZFtyEhXxt3ZVI3AHTI5oCaUqVh2o2nu3CZ/vuxsxg/62Rk?= =?utf-8?q?z7iE2+fu28mGePRZ6YWQvizKOyv6CJE2sT3WMWdLSj8DVmJshB1ndWxRrgqj8qkw2?= =?utf-8?q?83lF9ErwBX1V+poYfAAK/3LN6eDt9QkOrMNBgNV700/pWPf4mLGNNWC2xncNQdMBn?= =?utf-8?q?AG5qRw8O8CoutqApTMnBYqrHDg3Xdgv7+RxWlL6922WH37WcgH9CCSXX1Ou2cQc6B?= =?utf-8?q?zREg3kiMdW3d6eVFa9bIeg12kC/7IQEJ3gRf/tuuYAbYTd9UqiBrCd92lhn8Uiunc?= =?utf-8?q?tcevzOdLENXAMLg78yJ2JvvK2nJ8uiAUglkWX913dpWAj+A7UW/R4j/uGAmopYNwD?= =?utf-8?q?CXU+iml927GHLt0isk3t9b7gseMV/KlVt/iUNShvqoXZmoNvJQJC+ZzdVzN8ZC4oG?= =?utf-8?q?8B/B/2AoIrk37CFoWbINBi+XRd8I133NEbhoLH7RsGflql6axNojkcrP4edpzis4S?= =?utf-8?q?GvEkKU9qpMzv?= 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)(376014)(366016)(1800799024); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?oAdF06/5vlXT/Ir0tj0yU2c10pj8?= =?utf-8?q?abkk+bksBg7difGaju3Uglk4iJo3yFV+70FNKJBpNgOtFkgXwjDtFNnR3z/JMJnio?= =?utf-8?q?e7p6vExr6HiNpsE6GoJJVYn1ghCvI0d9FfPM4qVeufVNPMAUsdCxnR9jemSctBs5q?= =?utf-8?q?ROiUAA3abbjYXKhKQW0jTIaeQs3MJghGt8bJqlSxKDOEU+ktqqft3Zy90r4UKS0eL?= =?utf-8?q?za1rpVjTUFH8lXyu2rDRQ2zdObWckXr6mhedFckjBPJP1rLgRfJcjdjcie0SJ70L6?= =?utf-8?q?c/lzVPnBLkl0rBtLBCBeCU2tGpUrVQL+KYRvzyj7mEBXkwPwVJ8dMb13YkF+1W+/X?= =?utf-8?q?39azoKOENs5x5YjUUIW4ngRelcXD2jf/lh8ShN1R+ZslymXrEt/gxHgL0IRtYvC/F?= =?utf-8?q?oj6jHPyjAoCGxsUZF87fADGFlebxO9iUNwt9ifj0KSc2s6RWp2AoaWE8Fv9QFRVcX?= =?utf-8?q?g7/DzEtgyWeCIirtXIWsl8n8W0ITU0Q0CVAjJRcyf/uwUzSJc5IT9lFMeu8zzLiMh?= =?utf-8?q?G8RzdIX9Gg1Dwqn1uuypj9ah6DZ39KXs/KCjeqN5cgSEmuqGxnjC+BglqpL5zUGSG?= =?utf-8?q?RbrTiEM9x6qH3oz7QJFSTwJ+117ZQvmJtjKCWmA9lKpRFTRIPaz7kSt+y5gwdLPyi?= =?utf-8?q?Y4huw+Zw2zYhVni2CwGowF4qugv9AuS/12USl+rWfspNN0MR57g56h4H941tZeFTs?= =?utf-8?q?K0dUOtUppgOtvF1v8XEiEmq6GqBQN/e8g/bJdtoUyPhQNohm4y0559j4lYZpDickI?= =?utf-8?q?BUNAyz5mAhg1Nqk0+aa9o0HZfSRGcPZwh8mvHDPSi2AOwYtlv/P0lKCLg9ZH2HBGw?= =?utf-8?q?jEFRy5LRMr/h6OtrzddQDFJNZG/+UDid97xqEs7JFQNShhA75KSP/9wqZHOQaAkCN?= =?utf-8?q?RY/96zZsSij+6AbI/CtCmMZ9DjizWnN89SpNGulcL5jhhk6IQq6vvXT+cA0NM2HRZ?= =?utf-8?q?CRHUZwVEti/YILXec8/Fyi/FGLCpqf93Uss1FUfPgQQf3THPKXWOn3rFUzX2auBDi?= =?utf-8?q?2ekNUQAGt197LZHcAIk1yd2r1vOYsds+ljUvgwTIaBaHPmK5rnwp7rQr/lGLsD5Ks?= =?utf-8?q?yVsN37VF0rc21S12EcDQRd5n1IFfBwDS8Nbn6G4v9ynsfSFt7/WG80yZ24BsQGE3W?= =?utf-8?q?fcYEB7eRtTQmBNp/KuAByRjUTrlKOk6eO5D6pSl/ctg1YAMxWNNlPNvS9mFNdVIdL?= =?utf-8?q?94lWG5Dm6gYRp8TQL/2E8mPjA7C8t95cX8Frz5P+/tdXgiS6MM3kq2XJ8ZZNnTtlF?= =?utf-8?q?TRx5bEBckURZEgXX6JNAJwREPaO/M3B/qS7wfyk8c9Bu6WROisFHgHzW5RHhSUaQo?= =?utf-8?q?YblNzBA95JrWemAAPaBZNyZ3Mdrk5HhRnpWP3GjG5BY8ExPI6ZsE/f8RxJO07M3Ge?= =?utf-8?q?uBf+l8MorzH9p5br+r2Z6QHgXBajeQUeruAvWDWZqEF/aBhr7lhHQC2MSupI7klLq?= =?utf-8?q?1hBT7JDCcXAUve9esDA0T2yPwCov/+EwqwXwjcL34779l93XDSffabKz1XuVmU7DA?= =?utf-8?q?b1MZPYhhotal8ISfx/QmDzOWArBbdBxtdg=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 512efeab-e054-4146-97a6-08dd4fb7eaa2 X-MS-Exchange-CrossTenant-AuthSource: PH7SPRMB0046.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 01:02:29.8981 (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: mkm59a0aEnA+oDf0e47pGv5wzmYzPe82NWo0ajA/L4E+PBL0Igru2KlXBRmdcTlhxmIXxA0hWYGn3tJtEqg5IA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR11MB6075 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" The only usage of the "PCH" infra is to detect which South Display Engine we should be using. Move it under display so we can convert all its callers towards intel_display struct later. No functional or code change. Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/i915/Makefile | 2 +- drivers/gpu/drm/i915/{soc => display}/intel_pch.c | 2 +- drivers/gpu/drm/i915/{soc => display}/intel_pch.h | 2 +- drivers/gpu/drm/i915/i915_drv.h | 3 +-- drivers/gpu/drm/xe/Makefile | 2 +- drivers/gpu/drm/xe/compat-i915-headers/soc/intel_pch.h | 6 ------ drivers/gpu/drm/xe/xe_device_types.h | 2 +- 7 files changed, 6 insertions(+), 13 deletions(-) rename drivers/gpu/drm/i915/{soc => display}/intel_pch.c (99%) rename drivers/gpu/drm/i915/{soc => display}/intel_pch.h (98%) delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/soc/intel_pch.h diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index ed05b131ed3a..3bac76059ba9 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -52,7 +52,6 @@ i915-y += \ i915-y += \ soc/intel_dram.o \ soc/intel_gmch.o \ - soc/intel_pch.o \ soc/intel_rom.o # core library code @@ -281,6 +280,7 @@ i915-y += \ display/intel_modeset_setup.o \ display/intel_modeset_verify.o \ display/intel_overlay.o \ + display/intel_pch.o \ display/intel_pch_display.o \ display/intel_pch_refclk.o \ display/intel_plane_initial.o \ diff --git a/drivers/gpu/drm/i915/soc/intel_pch.c b/drivers/gpu/drm/i915/display/intel_pch.c similarity index 99% rename from drivers/gpu/drm/i915/soc/intel_pch.c rename to drivers/gpu/drm/i915/display/intel_pch.c index 82dc7fbd1a3e..37766e40fd1c 100644 --- a/drivers/gpu/drm/i915/soc/intel_pch.c +++ b/drivers/gpu/drm/i915/display/intel_pch.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT /* - * Copyright 2019 Intel Corporation. + * Copyright 2025 Intel Corporation. */ #include "i915_drv.h" diff --git a/drivers/gpu/drm/i915/soc/intel_pch.h b/drivers/gpu/drm/i915/display/intel_pch.h similarity index 98% rename from drivers/gpu/drm/i915/soc/intel_pch.h rename to drivers/gpu/drm/i915/display/intel_pch.h index 635aea7a5539..b9fa2b2f07bc 100644 --- a/drivers/gpu/drm/i915/soc/intel_pch.h +++ b/drivers/gpu/drm/i915/display/intel_pch.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: MIT */ /* - * Copyright 2019 Intel Corporation. + * Copyright 2025 Intel Corporation. */ #ifndef __INTEL_PCH__ diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index ffc346379cc2..2a2db0a6859e 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -38,6 +38,7 @@ #include "display/intel_display_limits.h" #include "display/intel_display_core.h" +#include "display/intel_pch.h" #include "gem/i915_gem_context_types.h" #include "gem/i915_gem_shrinker.h" @@ -49,8 +50,6 @@ #include "gt/intel_workarounds.h" #include "gt/uc/intel_uc.h" -#include "soc/intel_pch.h" - #include "i915_drm_client.h" #include "i915_gem.h" #include "i915_gpu_error.h" diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile index 5ce65ccb3c08..df30c4385403 100644 --- a/drivers/gpu/drm/xe/Makefile +++ b/drivers/gpu/drm/xe/Makefile @@ -192,7 +192,6 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \ # SOC code shared with i915 xe-$(CONFIG_DRM_XE_DISPLAY) += \ i915-soc/intel_dram.o \ - i915-soc/intel_pch.o \ i915-soc/intel_rom.o # Display code shared with i915 @@ -267,6 +266,7 @@ xe-$(CONFIG_DRM_XE_DISPLAY) += \ i915-display/intel_panel.o \ i915-display/intel_pfit.o \ i915-display/intel_pmdemand.o \ + i915-display/intel_pch.o \ i915-display/intel_pps.o \ i915-display/intel_psr.o \ i915-display/intel_qp_tables.o \ diff --git a/drivers/gpu/drm/xe/compat-i915-headers/soc/intel_pch.h b/drivers/gpu/drm/xe/compat-i915-headers/soc/intel_pch.h deleted file mode 100644 index 9c46556d33a4..000000000000 --- a/drivers/gpu/drm/xe/compat-i915-headers/soc/intel_pch.h +++ /dev/null @@ -1,6 +0,0 @@ -/* SPDX-License-Identifier: MIT */ -/* - * Copyright © 2023 Intel Corporation - */ - -#include "../../../i915/soc/intel_pch.h" diff --git a/drivers/gpu/drm/xe/xe_device_types.h b/drivers/gpu/drm/xe/xe_device_types.h index 4656305dd45a..2586ffc4909b 100644 --- a/drivers/gpu/drm/xe/xe_device_types.h +++ b/drivers/gpu/drm/xe/xe_device_types.h @@ -30,7 +30,7 @@ #endif #if IS_ENABLED(CONFIG_DRM_XE_DISPLAY) -#include "soc/intel_pch.h" +#include "intel_pch.h" #include "intel_display_core.h" #include "intel_display_device.h" #endif