Commit a37c68dd authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/pciids: separate ARL and MTL PCI IDs 



Avoid including PCI IDs for one platform to the PCI IDs of another. It's
more clear to deal with them completely separately at the PCI ID macro
level.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b70af19ea017a76af4678d0a4ee8332253ee1f3b.1725443418.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent fc9cb46b

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

+1 −0
Original line number Diff line number Diff line
@@ -1318,6 +1318,7 @@ static const struct { 
	INTEL_RPLU_IDS(INTEL_DISPLAY_DEVICE, &adl_p_desc),

	INTEL_RPLP_IDS(INTEL_DISPLAY_DEVICE, &adl_p_desc),

	INTEL_DG2_IDS(INTEL_DISPLAY_DEVICE, &dg2_desc),

	INTEL_ARL_IDS(INTEL_DISPLAY_DEVICE, &mtl_desc),

	INTEL_MTL_IDS(INTEL_DISPLAY_DEVICE, &mtl_desc),

	INTEL_LNL_IDS(INTEL_DISPLAY_DEVICE, &lnl_desc),

	INTEL_BMG_IDS(INTEL_DISPLAY_DEVICE, &bmg_desc),

drivers/gpu/drm/i915/i915_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -870,6 +870,7 @@ static const struct pci_device_id pciidlist[] = { 
	INTEL_RPLP_IDS(INTEL_VGA_DEVICE, &adl_p_info),

	INTEL_DG2_IDS(INTEL_VGA_DEVICE, &dg2_info),

	INTEL_ATS_M_IDS(INTEL_VGA_DEVICE, &ats_m_info),

	INTEL_ARL_IDS(INTEL_VGA_DEVICE, &mtl_info),

	INTEL_MTL_IDS(INTEL_VGA_DEVICE, &mtl_info),

	{}

};

include/drm/intel/i915_pciids.h

+2 −2
Original line number Diff line number Diff line
@@ -764,15 +764,15 @@ 
	INTEL_ATS_M150_IDS(MACRO__, ## __VA_ARGS__), \

	INTEL_ATS_M75_IDS(MACRO__, ## __VA_ARGS__)



/* MTL */

/* ARL */

#define INTEL_ARL_IDS(MACRO__, ...) \

	MACRO__(0x7D41, ## __VA_ARGS__), \

	MACRO__(0x7D51, ## __VA_ARGS__), \

	MACRO__(0x7D67, ## __VA_ARGS__), \

	MACRO__(0x7DD1, ## __VA_ARGS__)



/* MTL */

#define INTEL_MTL_IDS(MACRO__, ...) \

	INTEL_ARL_IDS(MACRO__, ## __VA_ARGS__), \

	MACRO__(0x7D40, ## __VA_ARGS__), \

	MACRO__(0x7D45, ## __VA_ARGS__), \

	MACRO__(0x7D55, ## __VA_ARGS__), \