[PATCH v2 1/2] drm/i915/display: Add MTL subplatforms definition

[Kandpal, Suraj]

> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces at lists.freedesktop.org> On Behalf Of
> Dnyaneshwar Bhadane
> Sent: Wednesday, December 18, 2024 1:43 AM
> To: intel-gfx at lists.freedesktop.org
> Cc: Bhadane, Dnyaneshwar <dnyaneshwar.bhadane at intel.com>
> Subject: [PATCH v2 1/2] drm/i915/display: Add MTL subplatforms definition
> 
> Separate MTL-U platform PCI ids in one define macro.
> 
> Add the MTL U/ARL U as subplatform member in MTL platform description
> structure to use display.platform.<platform> from intel_display structure
> instead of IS_<PLATFORM>() in display code path.
> 
> v2:
> - Club ARL-u in MTL and identify ARL-u as MTL-u subplatform(Jani)
> 
> Signed-off-by: Dnyaneshwar Bhadane <dnyaneshwar.bhadane at intel.com>

LGTM,
Reviewed-by: Suraj Kandpal <suraj.kandpal at intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_display_device.c | 13 +++++++++++++
> drivers/gpu/drm/i915/display/intel_display_device.h |  1 +
>  include/drm/intel/pciids.h                          |  7 +++++--
>  3 files changed, 19 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c
> b/drivers/gpu/drm/i915/display/intel_display_device.c
> index 68cb7f9b9ef3..738ae522c8f4 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.c
> @@ -1357,6 +1357,12 @@ static const struct intel_display_device_info
> xe2_hpd_display = {
>  		BIT(PORT_TC1) | BIT(PORT_TC2) | BIT(PORT_TC3) |
> BIT(PORT_TC4),  };
> 
> +static const u16 mtl_u_ids[] = {
> +	INTEL_MTL_U_IDS(ID),
> +	INTEL_ARL_U_IDS(ID),
> +	0
> +};
> +
>  /*
>   * Do not initialize the .info member of the platform desc for GMD ID based
>   * platforms. Their display will be probed automatically based on the IP
> version @@ -1364,6 +1370,13 @@ static const struct
> intel_display_device_info xe2_hpd_display = {
>   */
>  static const struct platform_desc mtl_desc = {
>  	PLATFORM(meteorlake),
> +	.subplatforms = (const struct subplatform_desc[]) {
> +		{
> +			SUBPLATFORM(meteorlake, u),
> +			.pciidlist = mtl_u_ids,
> +		},
> +		{},
> +	}
>  };
> 
>  static const struct platform_desc lnl_desc = { diff --git
> a/drivers/gpu/drm/i915/display/intel_display_device.h
> b/drivers/gpu/drm/i915/display/intel_display_device.h
> index 9a333d9e6601..5853472bb9c2 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_device.h
> +++ b/drivers/gpu/drm/i915/display/intel_display_device.h
> @@ -96,6 +96,7 @@ struct pci_dev;
>  	func(dg2_g12) \
>  	/* Display ver 14 (based on GMD ID) */ \
>  	func(meteorlake) \
> +	func(meteorlake_u) \
>  	/* Display ver 20 (based on GMD ID) */ \
>  	func(lunarlake) \
>  	/* Display ver 14.1 (based on GMD ID) */ \ diff --git
> a/include/drm/intel/pciids.h b/include/drm/intel/pciids.h index
> 77c826589ec1..9c3a339e26af 100644
> --- a/include/drm/intel/pciids.h
> +++ b/include/drm/intel/pciids.h
> @@ -811,9 +811,12 @@
>  	INTEL_ARL_S_IDS(MACRO__, ## __VA_ARGS__)
> 
>  /* MTL */
> -#define INTEL_MTL_IDS(MACRO__, ...) \
> +#define INTEL_MTL_U_IDS(MACRO__, ...) \
>  	MACRO__(0x7D40, ## __VA_ARGS__), \
> -	MACRO__(0x7D45, ## __VA_ARGS__), \
> +	MACRO__(0x7D45, ## __VA_ARGS__)
> +
> +#define INTEL_MTL_IDS(MACRO__, ...) \
> +	INTEL_MTL_U_IDS(MACRO__, ## __VA_ARGS__), \
>  	MACRO__(0x7D55, ## __VA_ARGS__), \
>  	MACRO__(0x7D60, ## __VA_ARGS__), \
>  	MACRO__(0x7DD5, ## __VA_ARGS__)
> --
> 2.34.1