Commit e35ecd95 authored by Dnyaneshwar Bhadane's avatar Dnyaneshwar Bhadane Committed by Matt Roper
Browse files

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: default avatarDnyaneshwar Bhadane <dnyaneshwar.bhadane@intel.com>
Reviewed-by: default avatarSuraj Kandpal <suraj.kandpal@intel.com>
Signed-off-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241217201301.3593054-2-dnyaneshwar.bhadane@intel.com
parent 73900dce

drivers/gpu/drm/i915/display/intel_display_device.c

+13 −0
Original line number Diff line number Diff line
@@ -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 = {

drivers/gpu/drm/i915/display/intel_display_device.h

+1 −0
Original line number Diff line number Diff line
@@ -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) */ \

include/drm/intel/pciids.h

+5 −2
Original line number Diff line number Diff line
@@ -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__)