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: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://patchwork.freedesktop.org/patch/msgid/044a5c553dc4564431bbef197d5e2dd085624fc2.1715340032.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index c150bb6f1a399a39087ca42657ad5eeeef0c9cc0..b2b9cc3b9545ce849b204bcb6e668b9bfe8a062d 100644 (file)
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -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),

diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c
index e47896002c132519829102810fb8f4fb16ec7e63..fb4c4054207e9bc2768cb8a9a717685693c9ef96 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_device.c
+++ b/drivers/gpu/drm/i915/display/intel_display_device.c
@@ -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),

diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
index 9e6d9072de359fa401330cb20c436aa6826aead8..fe5cb3fcfe7372bbefd987fb11c7976cf6711ac5 100644 (file)
--- a/drivers/gpu/drm/i915/i915_pci.c
+++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -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),

diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index a0a43ea07f118392497d02c64619ef1abfdb737c..64651a54a245ae9507c7bb5c9f0efe11456d9ebf 100644 (file)
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -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[] = {

diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
index ecfd7f71e2e744cbdb011031b340fa7b81fbee5a..42913d2eb655dad7e006cdd946561cc1fbc27992 100644 (file)
--- a/include/drm/i915_pciids.h
+++ b/include/drm/i915_pciids.h
@@ -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) \