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

drm/i915/pciids: don't include RPL-U PCI IDs in RPL-P 



It's confusing for INTEL_RPLP_IDS() to include INTEL_RPLU_IDS(). Even if
we treat them the same elsewhere, the lists of PCI IDs should not.

Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://patchwork.freedesktop.org/patch/msgid/28fe0910efb93a28c400728af14beff015667f42.1715340032.git.jani.nikula@intel.com


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

arch/x86/kernel/early-quirks.c

+1 −0
Original line number Diff line number Diff line
@@ -556,6 +556,7 @@ static const struct pci_device_id intel_early_ids[] __initconst = { 
	INTEL_ADLP_IDS(&gen11_early_ops),

	INTEL_ADLN_IDS(&gen11_early_ops),

	INTEL_RPLS_IDS(&gen11_early_ops),

	INTEL_RPLU_IDS(&gen11_early_ops),

	INTEL_RPLP_IDS(&gen11_early_ops),

};

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

+1 −0
Original line number Diff line number Diff line
@@ -841,6 +841,7 @@ static const struct { 
	INTEL_RPLS_IDS(&adl_s_display),

	INTEL_ADLP_IDS(&xe_lpd_display),

	INTEL_ADLN_IDS(&xe_lpd_display),

	INTEL_RPLU_IDS(&xe_lpd_display),

	INTEL_RPLP_IDS(&xe_lpd_display),

	INTEL_DG2_IDS(&xe_hpd_display),

drivers/gpu/drm/i915/i915_pci.c

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

	INTEL_DG1_IDS(&dg1_info),

	INTEL_RPLS_IDS(&adl_s_info),

	INTEL_RPLU_IDS(&adl_p_info),

	INTEL_RPLP_IDS(&adl_p_info),

	INTEL_DG2_IDS(&dg2_info),

	INTEL_ATS_M_IDS(&ats_m_info),

drivers/gpu/drm/i915/intel_device_info.c

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ static const u16 subplatform_n_ids[] = { 


static const u16 subplatform_rpl_ids[] = {

	INTEL_RPLS_IDS(0),

	INTEL_RPLU_IDS(0),

	INTEL_RPLP_IDS(0),

};

include/drm/i915_pciids.h

+0 −1
Original line number Diff line number Diff line
@@ -717,7 +717,6 @@ 


/* RPL-P */

#define INTEL_RPLP_IDS(info) \

	INTEL_RPLU_IDS(info), \

	INTEL_VGA_DEVICE(0xA720, info), \

	INTEL_VGA_DEVICE(0xA7A0, info), \

	INTEL_VGA_DEVICE(0xA7A8, info), \