Commit 7858cc0b authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/pciids: remove 12 from INTEL_TGL_IDS() 



Most other PCI ID macros do not encode the gen in the name. Follow suit
for TGL.

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/044a5c553dc4564431bbef197d5e2dd085624fc2.1715340032.git.jani.nikula@intel.com


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

arch/x86/kernel/early-quirks.c

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

	INTEL_EHL_IDS(&gen11_early_ops),

	INTEL_JSL_IDS(&gen11_early_ops),

	INTEL_TGL_12_IDS(&gen11_early_ops),

	INTEL_TGL_IDS(&gen11_early_ops),

	INTEL_RKL_IDS(&gen11_early_ops),

	INTEL_ADLS_IDS(&gen11_early_ops),

	INTEL_ADLP_IDS(&gen11_early_ops),

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

+1 −1
Original line number Diff line number Diff line
@@ -834,7 +834,7 @@ static const struct { 
	INTEL_ICL_IDS(&icl_display),

	INTEL_EHL_IDS(&jsl_ehl_display),

	INTEL_JSL_IDS(&jsl_ehl_display),

	INTEL_TGL_12_IDS(&tgl_display),

	INTEL_TGL_IDS(&tgl_display),

	INTEL_DG1_IDS(&dg1_display),

	INTEL_RKL_IDS(&rkl_display),

	INTEL_ADLS_IDS(&adl_s_display),

drivers/gpu/drm/i915/i915_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ static const struct pci_device_id pciidlist[] = { 
	INTEL_ICL_IDS(&icl_info),

	INTEL_EHL_IDS(&ehl_info),

	INTEL_JSL_IDS(&jsl_info),

	INTEL_TGL_12_IDS(&tgl_info),

	INTEL_TGL_IDS(&tgl_info),

	INTEL_RKL_IDS(&rkl_info),

	INTEL_ADLS_IDS(&adl_s_info),

	INTEL_ADLP_IDS(&adl_p_info),

drivers/gpu/drm/i915/intel_device_info.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static const u16 subplatform_portf_ids[] = { 
};



static const u16 subplatform_uy_ids[] = {

	INTEL_TGL_12_GT2_IDS(0),

	INTEL_TGL_GT2_IDS(0),

};



static const u16 subplatform_n_ids[] = {

include/drm/i915_pciids.h

+5 −5
Original line number Diff line number Diff line
@@ -620,12 +620,12 @@ 
	INTEL_VGA_DEVICE(0x4E71, info)



/* TGL */

#define INTEL_TGL_12_GT1_IDS(info) \

#define INTEL_TGL_GT1_IDS(info) \

	INTEL_VGA_DEVICE(0x9A60, info), \

	INTEL_VGA_DEVICE(0x9A68, info), \

	INTEL_VGA_DEVICE(0x9A70, info)



#define INTEL_TGL_12_GT2_IDS(info) \

#define INTEL_TGL_GT2_IDS(info) \

	INTEL_VGA_DEVICE(0x9A40, info), \

	INTEL_VGA_DEVICE(0x9A49, info), \

	INTEL_VGA_DEVICE(0x9A59, info), \
@@ -635,9 +635,9 @@ 
	INTEL_VGA_DEVICE(0x9AD9, info), \

	INTEL_VGA_DEVICE(0x9AF8, info)



#define INTEL_TGL_12_IDS(info) \

	INTEL_TGL_12_GT1_IDS(info), \

	INTEL_TGL_12_GT2_IDS(info)

#define INTEL_TGL_IDS(info) \

	INTEL_TGL_GT1_IDS(info), \

	INTEL_TGL_GT2_IDS(info)



/* RKL */

#define INTEL_RKL_IDS(info) \