summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2024-05-22 13:35:20 +0300
committerKamil Konieczny <kamil.konieczny@linux.intel.com>2024-05-23 16:27:36 +0200
commit9702d87169f7a733d80c4dbc9eab8057d91ed9bf (patch)
tree03072b787fdff7e2d3316f4d7b574c3bcfb027d6 /lib
parentea767a50aa934bb97226cc8edebc60602d2ccde3 (diff)
lib: sync i915_pciids.h with kernel commit 7858cc0b55e3
Synchronize i915_pciids.h with kernel commit: 7858cc0b55e3 ("drm/i915/pciids: remove 12 from INTEL_TGL_IDS()") and update the references in intel_device_info.c. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/i915_pciids.h10
-rw-r--r--lib/intel_device_info.c4
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
index ecfd7f71e..42913d2eb 100644
--- a/lib/i915_pciids.h
+++ b/lib/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) \
diff --git a/lib/intel_device_info.c b/lib/intel_device_info.c
index 79e3796db..b1eec572d 100644
--- a/lib/intel_device_info.c
+++ b/lib/intel_device_info.c
@@ -599,8 +599,8 @@ static const struct pci_id_match intel_device_match[] = {
INTEL_EHL_IDS(&intel_elkhartlake_info),
INTEL_JSL_IDS(&intel_jasperlake_info),
- INTEL_TGL_12_GT1_IDS(&intel_tigerlake_gt1_info),
- INTEL_TGL_12_GT2_IDS(&intel_tigerlake_gt2_info),
+ INTEL_TGL_GT1_IDS(&intel_tigerlake_gt1_info),
+ INTEL_TGL_GT2_IDS(&intel_tigerlake_gt2_info),
INTEL_RKL_IDS(&intel_rocketlake_info),
INTEL_DG1_IDS(&intel_dg1_info),