[Intel-xe] [PATCH 2/2] drm/xe: Sync MTL PCI IDs with i915

[Matt Roper]

On Tue, Nov 21, 2023 at 11:52:09AM -0800, Lucas De Marchi wrote:
> For Xe1 platforms, it's better to follow the way i915 adds the PCI IDs
> to the header, so it's easier to catch up when there is an update. This
> brings the same logic applied in commit 2e3c369f23a7 ("drm/i915/mtl:
> Eliminate subplatforms") to the equivalent xe header.
> 
> The end result of this header for Xe1 platforms is now in sync with i915
> as of commit 5032c607e886 ("drm/i915: ATS-M device ID update"). This can
> be seen by
> 
> 	$ git show 5032c607e886:include/drm/i915_pciids.h > a.h
> 	$ git diff --color-words  --no-index a.h include/drm/xe_pciids.h
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

Reviewed-by: Matt Roper <matthew.d.roper at intel.com>

> ---
>  include/drm/xe_pciids.h | 37 +++++++++----------------------------
>  1 file changed, 9 insertions(+), 28 deletions(-)
> 
> diff --git a/include/drm/xe_pciids.h b/include/drm/xe_pciids.h
> index c7d73d6476c8..3011d99a05c5 100644
> --- a/include/drm/xe_pciids.h
> +++ b/include/drm/xe_pciids.h
> @@ -173,6 +173,15 @@
>  	XE_ATS_M150_IDS(MACRO__, ## __VA_ARGS__),\
>  	XE_ATS_M75_IDS(MACRO__, ## __VA_ARGS__)
>  
> +/* MTL / ARL */
> +#define XE_MTL_IDS(MACRO__, ...)		\
> +	MACRO__(0x7D40, ## __VA_ARGS__),	\
> +	MACRO__(0x7D45, ## __VA_ARGS__),	\
> +	MACRO__(0x7D55, ## __VA_ARGS__),	\
> +	MACRO__(0x7D60, ## __VA_ARGS__),	\
> +	MACRO__(0x7D67, ## __VA_ARGS__),	\
> +	MACRO__(0x7DD5, ## __VA_ARGS__)
> +
>  /* PVC */
>  #define XE_PVC_IDS(MACRO__, ...)		\
>  	MACRO__(0x0B69, ## __VA_ARGS__),	\
> @@ -188,34 +197,6 @@
>  	MACRO__(0x0BE1, ## __VA_ARGS__),	\
>  	MACRO__(0x0BE5, ## __VA_ARGS__)
>  
> -/* MTL */
> -#define XE_MTL_M_IDS(MACRO__, ...)		\
> -	MACRO__(0x7D40, ## __VA_ARGS__),	\
> -	MACRO__(0x7D43, ## __VA_ARGS__),	\
> -	MACRO__(0x7DC0, ## __VA_ARGS__)
> -
> -#define XE_MTL_P_IDS(MACRO__, ...)		\
> -	MACRO__(0x7D45, ## __VA_ARGS__),	\
> -	MACRO__(0x7D47, ## __VA_ARGS__),	\
> -	MACRO__(0x7D50, ## __VA_ARGS__),	\
> -	MACRO__(0x7D55, ## __VA_ARGS__),	\
> -	MACRO__(0x7DC5, ## __VA_ARGS__),	\
> -	MACRO__(0x7DD0, ## __VA_ARGS__),	\
> -	MACRO__(0x7DD5, ## __VA_ARGS__)
> -
> -#define XE_MTL_S_IDS(MACRO__, ...)		\
> -	MACRO__(0x7D60, ## __VA_ARGS__),	\
> -	MACRO__(0x7DE0, ## __VA_ARGS__)
> -
> -#define XE_ARL_IDS(MACRO__, ...)		\
> -	MACRO__(0x7D67, ## __VA_ARGS__)
> -
> -#define XE_MTL_IDS(MACRO__, ...)		\
> -	XE_MTL_M_IDS(MACRO__, ## __VA_ARGS__),	\
> -	XE_MTL_P_IDS(MACRO__, ## __VA_ARGS__),	\
> -	XE_MTL_S_IDS(MACRO__, ## __VA_ARGS__),	\
> -	XE_ARL_IDS(MACRO__, ## __VA_ARGS__)
> -
>  #define XE_LNL_IDS(MACRO__, ...) \
>  	MACRO__(0x6420, ## __VA_ARGS__), \
>  	MACRO__(0x64A0, ## __VA_ARGS__), \
> -- 
> 2.40.1
> 

-- 
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation