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 E1228E7719C for ; Fri, 10 Jan 2025 10:26:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9877710F05B; Fri, 10 Jan 2025 10:26:08 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="XRevWH/l"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3EE0510E18D; Fri, 10 Jan 2025 10:26:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1736504766; x=1768040766; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version:content-transfer-encoding; bh=i2sX1QcO4GNjX8eC5qV4p4VSay0n8i5QchUpXXvpen4=; b=XRevWH/lWatA+6GSs+f7irjLTwlVifqC0FX3IaEDpWmz6ZrkKGIXqKcs MxYZBjzlDs+Ubadw4GRkEiVAFw6NYeluqDf1eo8vlhsSMbgjacKOtqK3C ct/qvz7xoYmcOu+BOocLvpT0Qb+1nbBSaRJSqUItXICLE58quZEu5+jZa bWUyvqqMSRyqpmILeO3jzOQlAmATIacxpfkjLvJ2r9KBRQQxYIXYkFp9q CDjEl0ZPjiqIyfoJGwc9RwEuqRhK1dbdj5r9PrFIh9GaB7POX9jypaaRU CCqO8ZmHVHRWwcOtvvOcLEz2kujwCXoAYYGoXR8YTp9HLfIgFGuetj2XW g==; X-CSE-ConnectionGUID: qkj7SV1kTP+/qf4TSC/vzg== X-CSE-MsgGUID: bENM81I1Rsaem7WKtyaiBA== X-IronPort-AV: E=McAfee;i="6700,10204,11310"; a="40559504" X-IronPort-AV: E=Sophos;i="6.12,303,1728975600"; d="scan'208";a="40559504" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2025 02:26:05 -0800 X-CSE-ConnectionGUID: 2JoUBnrmSLGYY2+0efMKbg== X-CSE-MsgGUID: vIEk60eQRd6dELUP/7Ji4Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="104579015" Received: from mjarzebo-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.246.15]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2025 02:26:03 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org Cc: Matt Atwood , Matt Roper , Rodrigo Vivi , Stephen Rothwell Subject: Re: [PATCH] drm/xe: remove unused xe_pciids.h harder, add missing PCI ID In-Reply-To: <20250109105032.2585416-1-jani.nikula@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20250109105032.2585416-1-jani.nikula@intel.com> Date: Fri, 10 Jan 2025 12:26:00 +0200 Message-ID: <87a5bzj77r.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 Thu, 09 Jan 2025, Jani Nikula wrote: > Commit 493454445c95 ("drm/xe: switch to common PCI ID macros") removed > xe_pciids.h via drm-intel-next. In the mean time, commit ae78ec0a52c4 > ("drm/xe/ptl: Add another PTL PCI ID") added to xe_pciids.h via > drm-xe-next. > > The two commits were merged in commit 8f109f287fdc ("Merge drm/drm-next > into drm-xe-next"), but xe_pciids.h wasn't removed, and the PCI ID > wasn't added to pciids.h. > > Remove xe_pciids.h, and add the PCI ID to pciids.h. > > Cc: Matt Atwood > Cc: Matt Roper > Cc: Rodrigo Vivi > Fixes: 8f109f287fdc ("Merge drm/drm-next into drm-xe-next") > Reported-by: Stephen Rothwell > Closes: https://lore.kernel.org/r/20241125120921.1bbc1930@canb.auug.org.au > Signed-off-by: Jani Nikula Pushed to drm-xe-next. BR, Jani. > > --- > > The problem has now percolated to at least drm-xe-next, drm-intel-next, > and drm-next. The conflict resolution in drm-tip adds the missing PCI ID > to pciids.h, which also means this patch won't apply to drm-tip, only to > the actual upstream branches. > --- > include/drm/intel/pciids.h | 3 +- > include/drm/intel/xe_pciids.h | 235 ---------------------------------- > 2 files changed, 2 insertions(+), 236 deletions(-) > delete mode 100644 include/drm/intel/xe_pciids.h > > diff --git a/include/drm/intel/pciids.h b/include/drm/intel/pciids.h > index c6518b0992cf..77c826589ec1 100644 > --- a/include/drm/intel/pciids.h > +++ b/include/drm/intel/pciids.h > @@ -858,6 +858,7 @@ > MACRO__(0xB092, ## __VA_ARGS__), \ > MACRO__(0xB0A0, ## __VA_ARGS__), \ > MACRO__(0xB0A1, ## __VA_ARGS__), \ > - MACRO__(0xB0A2, ## __VA_ARGS__) > + MACRO__(0xB0A2, ## __VA_ARGS__), \ > + MACRO__(0xB0B0, ## __VA_ARGS__) >=20=20 > #endif /* __PCIIDS_H__ */ > diff --git a/include/drm/intel/xe_pciids.h b/include/drm/intel/xe_pciids.h > deleted file mode 100644 > index 16d4b8bb590a..000000000000 > --- a/include/drm/intel/xe_pciids.h > +++ /dev/null > @@ -1,235 +0,0 @@ > -/* SPDX-License-Identifier: MIT */ > -/* > - * Copyright =C2=A9 2022 Intel Corporation > - */ > - > -#ifndef _XE_PCIIDS_H_ > -#define _XE_PCIIDS_H_ > - > -/* > - * Lists below can be turned into initializers for a struct pci_device_id > - * by defining INTEL_VGA_DEVICE: > - * > - * #define INTEL_VGA_DEVICE(id, info) { \ > - * 0x8086, id, \ > - * ~0, ~0, \ > - * 0x030000, 0xff0000, \ > - * (unsigned long) info } > - * > - * And then calling like: > - * > - * XE_TGL_12_GT1_IDS(INTEL_VGA_DEVICE, ## __VA_ARGS__) > - * > - * To turn them into something else, just provide a different macro pass= ed as > - * first argument. > - */ > - > -/* TGL */ > -#define XE_TGL_GT1_IDS(MACRO__, ...) \ > - MACRO__(0x9A60, ## __VA_ARGS__), \ > - MACRO__(0x9A68, ## __VA_ARGS__), \ > - MACRO__(0x9A70, ## __VA_ARGS__) > - > -#define XE_TGL_GT2_IDS(MACRO__, ...) \ > - MACRO__(0x9A40, ## __VA_ARGS__), \ > - MACRO__(0x9A49, ## __VA_ARGS__), \ > - MACRO__(0x9A59, ## __VA_ARGS__), \ > - MACRO__(0x9A78, ## __VA_ARGS__), \ > - MACRO__(0x9AC0, ## __VA_ARGS__), \ > - MACRO__(0x9AC9, ## __VA_ARGS__), \ > - MACRO__(0x9AD9, ## __VA_ARGS__), \ > - MACRO__(0x9AF8, ## __VA_ARGS__) > - > -#define XE_TGL_IDS(MACRO__, ...) \ > - XE_TGL_GT1_IDS(MACRO__, ## __VA_ARGS__),\ > - XE_TGL_GT2_IDS(MACRO__, ## __VA_ARGS__) > - > -/* RKL */ > -#define XE_RKL_IDS(MACRO__, ...) \ > - MACRO__(0x4C80, ## __VA_ARGS__), \ > - MACRO__(0x4C8A, ## __VA_ARGS__), \ > - MACRO__(0x4C8B, ## __VA_ARGS__), \ > - MACRO__(0x4C8C, ## __VA_ARGS__), \ > - MACRO__(0x4C90, ## __VA_ARGS__), \ > - MACRO__(0x4C9A, ## __VA_ARGS__) > - > -/* DG1 */ > -#define XE_DG1_IDS(MACRO__, ...) \ > - MACRO__(0x4905, ## __VA_ARGS__), \ > - MACRO__(0x4906, ## __VA_ARGS__), \ > - MACRO__(0x4907, ## __VA_ARGS__), \ > - MACRO__(0x4908, ## __VA_ARGS__), \ > - MACRO__(0x4909, ## __VA_ARGS__) > - > -/* ADL-S */ > -#define XE_ADLS_IDS(MACRO__, ...) \ > - MACRO__(0x4680, ## __VA_ARGS__), \ > - MACRO__(0x4682, ## __VA_ARGS__), \ > - MACRO__(0x4688, ## __VA_ARGS__), \ > - MACRO__(0x468A, ## __VA_ARGS__), \ > - MACRO__(0x468B, ## __VA_ARGS__), \ > - MACRO__(0x4690, ## __VA_ARGS__), \ > - MACRO__(0x4692, ## __VA_ARGS__), \ > - MACRO__(0x4693, ## __VA_ARGS__) > - > -/* ADL-P */ > -#define XE_ADLP_IDS(MACRO__, ...) \ > - MACRO__(0x46A0, ## __VA_ARGS__), \ > - MACRO__(0x46A1, ## __VA_ARGS__), \ > - MACRO__(0x46A2, ## __VA_ARGS__), \ > - MACRO__(0x46A3, ## __VA_ARGS__), \ > - MACRO__(0x46A6, ## __VA_ARGS__), \ > - MACRO__(0x46A8, ## __VA_ARGS__), \ > - MACRO__(0x46AA, ## __VA_ARGS__), \ > - MACRO__(0x462A, ## __VA_ARGS__), \ > - MACRO__(0x4626, ## __VA_ARGS__), \ > - MACRO__(0x4628, ## __VA_ARGS__), \ > - MACRO__(0x46B0, ## __VA_ARGS__), \ > - MACRO__(0x46B1, ## __VA_ARGS__), \ > - MACRO__(0x46B2, ## __VA_ARGS__), \ > - MACRO__(0x46B3, ## __VA_ARGS__), \ > - MACRO__(0x46C0, ## __VA_ARGS__), \ > - MACRO__(0x46C1, ## __VA_ARGS__), \ > - MACRO__(0x46C2, ## __VA_ARGS__), \ > - MACRO__(0x46C3, ## __VA_ARGS__) > - > -/* ADL-N */ > -#define XE_ADLN_IDS(MACRO__, ...) \ > - MACRO__(0x46D0, ## __VA_ARGS__), \ > - MACRO__(0x46D1, ## __VA_ARGS__), \ > - MACRO__(0x46D2, ## __VA_ARGS__), \ > - MACRO__(0x46D3, ## __VA_ARGS__), \ > - MACRO__(0x46D4, ## __VA_ARGS__) > - > -/* RPL-S */ > -#define XE_RPLS_IDS(MACRO__, ...) \ > - MACRO__(0xA780, ## __VA_ARGS__), \ > - MACRO__(0xA781, ## __VA_ARGS__), \ > - MACRO__(0xA782, ## __VA_ARGS__), \ > - MACRO__(0xA783, ## __VA_ARGS__), \ > - MACRO__(0xA788, ## __VA_ARGS__), \ > - MACRO__(0xA789, ## __VA_ARGS__), \ > - MACRO__(0xA78A, ## __VA_ARGS__), \ > - MACRO__(0xA78B, ## __VA_ARGS__) > - > -/* RPL-U */ > -#define XE_RPLU_IDS(MACRO__, ...) \ > - MACRO__(0xA721, ## __VA_ARGS__), \ > - MACRO__(0xA7A1, ## __VA_ARGS__), \ > - MACRO__(0xA7A9, ## __VA_ARGS__), \ > - MACRO__(0xA7AC, ## __VA_ARGS__), \ > - MACRO__(0xA7AD, ## __VA_ARGS__) > - > -/* RPL-P */ > -#define XE_RPLP_IDS(MACRO__, ...) \ > - MACRO__(0xA720, ## __VA_ARGS__), \ > - MACRO__(0xA7A0, ## __VA_ARGS__), \ > - MACRO__(0xA7A8, ## __VA_ARGS__), \ > - MACRO__(0xA7AA, ## __VA_ARGS__), \ > - MACRO__(0xA7AB, ## __VA_ARGS__) > - > -/* DG2 */ > -#define XE_DG2_G10_IDS(MACRO__, ...) \ > - MACRO__(0x5690, ## __VA_ARGS__), \ > - MACRO__(0x5691, ## __VA_ARGS__), \ > - MACRO__(0x5692, ## __VA_ARGS__), \ > - MACRO__(0x56A0, ## __VA_ARGS__), \ > - MACRO__(0x56A1, ## __VA_ARGS__), \ > - MACRO__(0x56A2, ## __VA_ARGS__), \ > - MACRO__(0x56BE, ## __VA_ARGS__), \ > - MACRO__(0x56BF, ## __VA_ARGS__) > - > -#define XE_DG2_G11_IDS(MACRO__, ...) \ > - MACRO__(0x5693, ## __VA_ARGS__), \ > - MACRO__(0x5694, ## __VA_ARGS__), \ > - MACRO__(0x5695, ## __VA_ARGS__), \ > - MACRO__(0x56A5, ## __VA_ARGS__), \ > - MACRO__(0x56A6, ## __VA_ARGS__), \ > - MACRO__(0x56B0, ## __VA_ARGS__), \ > - MACRO__(0x56B1, ## __VA_ARGS__), \ > - MACRO__(0x56BA, ## __VA_ARGS__), \ > - MACRO__(0x56BB, ## __VA_ARGS__), \ > - MACRO__(0x56BC, ## __VA_ARGS__), \ > - MACRO__(0x56BD, ## __VA_ARGS__) > - > -#define XE_DG2_G12_IDS(MACRO__, ...) \ > - MACRO__(0x5696, ## __VA_ARGS__), \ > - MACRO__(0x5697, ## __VA_ARGS__), \ > - MACRO__(0x56A3, ## __VA_ARGS__), \ > - MACRO__(0x56A4, ## __VA_ARGS__), \ > - MACRO__(0x56B2, ## __VA_ARGS__), \ > - MACRO__(0x56B3, ## __VA_ARGS__) > - > -#define XE_DG2_IDS(MACRO__, ...) \ > - XE_DG2_G10_IDS(MACRO__, ## __VA_ARGS__),\ > - XE_DG2_G11_IDS(MACRO__, ## __VA_ARGS__),\ > - XE_DG2_G12_IDS(MACRO__, ## __VA_ARGS__) > - > -#define XE_ATS_M150_IDS(MACRO__, ...) \ > - MACRO__(0x56C0, ## __VA_ARGS__), \ > - MACRO__(0x56C2, ## __VA_ARGS__) > - > -#define XE_ATS_M75_IDS(MACRO__, ...) \ > - MACRO__(0x56C1, ## __VA_ARGS__) > - > -#define XE_ATS_M_IDS(MACRO__, ...) \ > - XE_ATS_M150_IDS(MACRO__, ## __VA_ARGS__),\ > - XE_ATS_M75_IDS(MACRO__, ## __VA_ARGS__) > - > -/* ARL */ > -#define XE_ARL_IDS(MACRO__, ...) \ > - MACRO__(0x7D41, ## __VA_ARGS__), \ > - MACRO__(0x7D51, ## __VA_ARGS__), \ > - MACRO__(0x7D67, ## __VA_ARGS__), \ > - MACRO__(0x7DD1, ## __VA_ARGS__), \ > - MACRO__(0xB640, ## __VA_ARGS__) > - > -/* MTL */ > -#define XE_MTL_IDS(MACRO__, ...) \ > - MACRO__(0x7D40, ## __VA_ARGS__), \ > - MACRO__(0x7D45, ## __VA_ARGS__), \ > - MACRO__(0x7D55, ## __VA_ARGS__), \ > - MACRO__(0x7D60, ## __VA_ARGS__), \ > - MACRO__(0x7DD5, ## __VA_ARGS__) > - > -/* PVC */ > -#define XE_PVC_IDS(MACRO__, ...) \ > - MACRO__(0x0B69, ## __VA_ARGS__), \ > - MACRO__(0x0B6E, ## __VA_ARGS__), \ > - MACRO__(0x0BD4, ## __VA_ARGS__), \ > - MACRO__(0x0BD5, ## __VA_ARGS__), \ > - MACRO__(0x0BD6, ## __VA_ARGS__), \ > - MACRO__(0x0BD7, ## __VA_ARGS__), \ > - MACRO__(0x0BD8, ## __VA_ARGS__), \ > - MACRO__(0x0BD9, ## __VA_ARGS__), \ > - MACRO__(0x0BDA, ## __VA_ARGS__), \ > - MACRO__(0x0BDB, ## __VA_ARGS__), \ > - MACRO__(0x0BE0, ## __VA_ARGS__), \ > - MACRO__(0x0BE1, ## __VA_ARGS__), \ > - MACRO__(0x0BE5, ## __VA_ARGS__) > - > -#define XE_LNL_IDS(MACRO__, ...) \ > - MACRO__(0x6420, ## __VA_ARGS__), \ > - MACRO__(0x64A0, ## __VA_ARGS__), \ > - MACRO__(0x64B0, ## __VA_ARGS__) > - > -#define XE_BMG_IDS(MACRO__, ...) \ > - MACRO__(0xE202, ## __VA_ARGS__), \ > - MACRO__(0xE20B, ## __VA_ARGS__), \ > - MACRO__(0xE20C, ## __VA_ARGS__), \ > - MACRO__(0xE20D, ## __VA_ARGS__), \ > - MACRO__(0xE212, ## __VA_ARGS__) > - > -#define XE_PTL_IDS(MACRO__, ...) \ > - MACRO__(0xB080, ## __VA_ARGS__), \ > - MACRO__(0xB081, ## __VA_ARGS__), \ > - MACRO__(0xB082, ## __VA_ARGS__), \ > - MACRO__(0xB090, ## __VA_ARGS__), \ > - MACRO__(0xB091, ## __VA_ARGS__), \ > - MACRO__(0xB092, ## __VA_ARGS__), \ > - MACRO__(0xB0A0, ## __VA_ARGS__), \ > - MACRO__(0xB0A1, ## __VA_ARGS__), \ > - MACRO__(0xB0A2, ## __VA_ARGS__), \ > - MACRO__(0xB0B0, ## __VA_ARGS__) > - > -#endif --=20 Jani Nikula, Intel